incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1292794 - in /incubator/ooo/trunk: ext_libraries/apr-util/ ext_libraries/apr-util/prj/ ext_libraries/apr/ ext_libraries/apr/prj/ ext_libraries/serf/ ext_libraries/serf/prj/ main/ main/postprocess/packcomponents/ main/sccomp/source/solver/ ...
Date Thu, 23 Feb 2012 13:29:56 GMT
Author: af
Date: Thu Feb 23 13:29:54 2012
New Revision: 1292794

URL: http://svn.apache.org/viewvc?rev=1292794&view=rev
Log:
118569: Replace neon with serf (and prerequisites apr and apr-util).

        Original author: orw@apache.org


Modified:
    incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
    incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst
    incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst
    incubator/ooo/trunk/ext_libraries/apr/makefile.mk
    incubator/ooo/trunk/ext_libraries/apr/prj/d.lst
    incubator/ooo/trunk/ext_libraries/serf/makefile.mk
    incubator/ooo/trunk/ext_libraries/serf/prj/d.lst
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp
    incubator/ooo/trunk/main/set_soenv.in
    incubator/ooo/trunk/main/solenv/inc/libs.mk
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/ContentProperties.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/ContentProperties.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVAuthListener.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVException.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVProperties.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVProperties.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResource.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSession.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSessionFactory.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSessionFactory.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVTypes.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DateTimeHelper.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/DateTimeHelper.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/PropertyMap.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/ucpdav1.component
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontent.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontentcaps.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavdatasupplier.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavdatasupplier.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavprovider.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresultset.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresultset.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavservices.cxx

Modified: incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk Thu Feb 23 13:29:54 2012
@@ -27,12 +27,15 @@ TARGET=aprutil
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
+.INCLUDE :      aprutil_version.mk
 
 # --- Files --------------------------------------------------------
 
-APRVERSION=1.4.1
+# Assemble the full version number from the parts defined in aprutil_version.mk
+APRUTIL_VERSION=$(APR_UTIL_MAJOR).$(APR_UTIL_MINOR).$(APR_UTIL_MICRO)
 
-TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
+
+TARFILE_NAME=$(PRJNAME)-$(APRUTIL_VERSION)
 TARFILE_MD5=666a5d56098a9debf998510e304c8095
 
 .IF "$(OS)"=="WNT"
@@ -56,13 +59,27 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 
 .ELSE
 
+
+
 CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
+CONFIGURE_ACTION=autoconf && .$/configure
 CONFIGURE_FLAGS=								\
 	--with-apr=$(OUTDIR)/bin/apr-1-config		\
 	--prefix=$(OUTDIR)							\
 	--includedir=$(OUTDIR)$/inc$/apr-util		\
-	--with-iconv="no"	
+	--with-iconv="no"				
+
+
+# Use our own expat on the Mac.  Maybe we should do this on Linux, too?
+.IF "$(OS)" == "MACOSX"
+
+CONFIGURE_FLAGS+= --with-expat=$(OUTDIR)
+# The non-standard names of our expat libraries (yes, plural) make 
+# a special handling in apr-utils configure necessary.
+PATCH_FILES+= $(TARFILE_NAME).mac.expat.patch
+
+.ENDIF
+
 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE)

Modified: incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst Thu Feb 23 13:29:54 2012
@@ -1,3 +1,3 @@
-apru     apr-util :  apr NULL	
-apru     apr-util usr1    -	all	apru_mkout NULL
-apru     apr-util nmake	-	all	apru_apr-util NULL
+apru     apr-util :  apr EXPAT:expat NULL	
+apru     apr-util usr1    -	all	apru_mkout NULL
+apru     apr-util nmake	-	all	apru_apr-util NULL

Modified: incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst Thu Feb 23 13:29:54 2012
@@ -1,12 +1,14 @@
 mkdir: %_DEST%\inc%_EXT%\apr-util
 ..\%__SRC%\inc\apr-util\apr*.h %_DEST%\inc%_EXT%\apr-util
 ..\%__SRC%\inc\apr-util\apu.h %_DEST%\inc%_EXT%\apr-util
+..\aprutil_version.mk %_DEST%\inc%_EXT%
 
 # Unixes
 ..\%__SRC%\bin\apu-1-config %_DEST%\bin%_EXT%
 
 # Linux
-..\%__SRC%\lib\libaprutil-1.so* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
+linklib: libaprutil-1.so.*.*
 
 # Mac
 ..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%

Modified: incubator/ooo/trunk/ext_libraries/apr/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr/makefile.mk?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/apr/makefile.mk Thu Feb 23 13:29:54 2012
@@ -27,10 +27,12 @@ TARGET=apr
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
+.INCLUDE :      apr_version.mk
 
 # --- Files --------------------------------------------------------
 
-APRVERSION=1.4.5
+# Assemble the full version number from the parts defined in apr_version.mk
+APRVERSION=$(APR_MAJOR).$(APR_MINOR).$(APR_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
 TARFILE_MD5=97262fe54dddaf583eaaee3497a426e1

Modified: incubator/ooo/trunk/ext_libraries/apr/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr/prj/d.lst?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr/prj/d.lst (original)
+++ incubator/ooo/trunk/ext_libraries/apr/prj/d.lst Thu Feb 23 13:29:54 2012
@@ -1,20 +1,22 @@
-mkdir: %_DEST%\inc%_EXT%\apr
-mkdir: %_DEST%\lib%_EXT%\apr
-
-# Includes
-..\%__SRC%\inc\apr\apr*.h %_DEST%\inc%_EXT%\apr
-
-# Windows
-..\%__SRC%\bin\libapr-1.dll %_DEST%\bin%_EXT%
-..\%__SRC%\lib\libapr-1.lib %_DEST%\lib%_EXT%
-
-# Unixes
-..\%__SRC%\bin\apr-1-config %_DEST%\bin%_EXT%
-..\%__SRC%\bin\libtool %_DEST%\lib%_EXT%\apr
-..\%__SRC%\bin\apr_rules.mk %_DEST%\lib%_EXT%\apr
-
-# Linux
-..\%__SRC%\lib\libapr-1.so* %_DEST%\lib%_EXT%
-
-# Mac
-..\%__SRC%\lib\libapr-1.*dylib %_DEST%\lib%_EXT%
+mkdir: %_DEST%\inc%_EXT%\apr
+mkdir: %_DEST%\lib%_EXT%\apr
+
+# Includes
+..\%__SRC%\inc\apr\apr*.h %_DEST%\inc%_EXT%\apr
+..\apr_version.mk %_DEST%\inc%_EXT%
+
+# Windows
+..\%__SRC%\bin\libapr-1.dll %_DEST%\bin%_EXT%
+..\%__SRC%\lib\libapr-1.lib %_DEST%\lib%_EXT%
+
+# Unixes
+..\%__SRC%\bin\apr-1-config %_DEST%\bin%_EXT%
+..\%__SRC%\bin\libtool %_DEST%\lib%_EXT%\apr
+..\%__SRC%\bin\apr_rules.mk %_DEST%\lib%_EXT%\apr
+
+# Linux
+..\%__SRC%\lib\libapr-1.so.*.* %_DEST%\lib%_EXT%
+linklib: libapr-1.so.*.*
+
+# Mac
+..\%__SRC%\lib\libapr-1.*dylib %_DEST%\lib%_EXT%

Modified: incubator/ooo/trunk/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/makefile.mk?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/serf/makefile.mk Thu Feb 23 13:29:54 2012
@@ -27,10 +27,12 @@ TARGET=so_serf
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
+.INCLUDE :	serf_version.mk
 
 # --- Files --------------------------------------------------------
 
-LIBSERFVERSION=1.0.0
+# Assemble the full version number from the parts defined in serf_version.mk
+LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINOR).$(SERF_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)
 TARFILE_MD5=3b179ed18f65c43141528aa6d2440db4
@@ -83,10 +85,8 @@ OUT2LIB=.libs/libserf-1.so*
 
 .ENDIF
 
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
-

Modified: incubator/ooo/trunk/ext_libraries/serf/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/prj/d.lst?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/prj/d.lst (original)
+++ incubator/ooo/trunk/ext_libraries/serf/prj/d.lst Thu Feb 23 13:29:54 2012
@@ -1,9 +1,11 @@
-mkdir: %_DEST%\inc%_EXT%\serf
-..\%__SRC%\inc\serf\serf*.h %_DEST%\inc%_EXT%\serf
-
-# Mac
-..\%__SRC%\lib\libserf-1.*dylib %_DEST%\lib%_EXT%
-
-# Linux, BSD, et al
-..\%__SRC%\lib\libserf-1.so* %_DEST%\lib%_EXT%
-
+mkdir: %_DEST%\inc%_EXT%\serf
+..\%__SRC%\inc\serf\serf*.h %_DEST%\inc%_EXT%\serf
+..\serf_version.mk %_DEST%\inc%_EXT%
+
+# Mac
+..\%__SRC%\lib\libserf-1.*dylib %_DEST%\lib%_EXT%
+
+# Linux, BSD, et al
+..\%__SRC%\lib\libserf-1.so.*.* %_DEST%\lib%_EXT%
+linklib: libserf-1.so.*.*
+

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Thu Feb 23 13:29:54 2012
@@ -553,9 +553,6 @@ AC_ARG_ENABLE(Xaw,
 [  --disable-Xaw           Disables the use of Xaw for the Netscape/Mozilla
                            plugin
 ],,)
-AC_ARG_WITH(system-neon,
-[  --with-system-neon      Use neon already on system
-],,)
 AC_ARG_ENABLE(hunspell,
 [  --enable-hunspell       Determines whether to enable the Hunspell library.
                           If enabled, the library will be built unless you
@@ -5134,23 +5131,6 @@ AC_SUBST(XRANDR_LIBS)
 AC_SUBST(ENABLE_RANDR)
 
 dnl ===================================================================
-dnl Check for system neon
-dnl ===================================================================
-AC_MSG_CHECKING([which neon is used])
-if test -n "$with_system_neon" -o -n "$with_system_libs" && \
-	test "$with_system_neon" != "no"; then
-        AC_MSG_RESULT([external])
-        PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
-        NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
-        NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
-        SYSTEM_NEON=YES
-fi	
-AC_SUBST(SYSTEM_NEON)
-AC_SUBST(NEON_VERSION)
-AC_SUBST(NEON_LIBS)
-AC_SUBST(NEON_CFLAGS)
-
-dnl ===================================================================
 dnl Check for system openssl
 dnl ===================================================================
 if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then

Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Thu Feb 23 13:29:54 2012
@@ -153,6 +153,7 @@ my_components = \
     tvhlp1 \
     ucb1 \
     ucpchelp1 \
+    ucpdav1 \
     ucpexpand1 \
     ucpext \
     ucpfile1 \
@@ -215,10 +216,6 @@ my_components +=     wpft
 my_components += emboleobj
 .END
 
-.IF "$(SYSTEM_NEON)" == "YES"
-my_components += ucpdav1
-.END
-
 .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 my_components += cairocanvas
 .END

Modified: incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk (original)
+++ incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk Thu Feb 23 13:29:54 2012
@@ -59,7 +59,7 @@ SHL1STDLIBS=    $(COMPHELPERLIB)    \
                 $(CPPULIB)          \
                 $(SALLIB)           \
                 $(TOOLSLIB)         \
-                $(COINMPLIB)
+                $(COINMPLIBS)
 
 SHL1DEPN=       makefile.mk
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Thu Feb 23 13:29:54 2012
@@ -1513,9 +1513,7 @@ File gid_File_Lib_Ucpchelp1
     Styles = (PACKED);
 End
 
-#ifdef SYSTEM_NEON
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
-#endif
 
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
 
@@ -2000,3 +1998,48 @@ End
 #endif
 #endif
 
+File gid_File_Lib_Apr
+     #ifdef WNT
+        Name = SPECIAL_NAME(libapr-1);
+     #else
+	// Looks like the major version number is part of the name, not
+	// part of the suffix.  An error?
+	#ifdef MACOSX
+            Name = STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
+        #else
+            Name = STRING(CONCAT6(libapr-1,UNXSUFFIX,.0.,APR_MINOR,.,APR_MICRO));
+        #endif
+     #endif
+     PACKED_LIB_FILE_BODY;
+End
+
+File gid_File_Lib_AprUtil
+    #ifdef WNT
+        Name = SPECIAL_NAME(apr-util);
+    #else
+	// Looks like the major version number is part of the name, not
+	// part of the suffix.  An error?
+	#ifdef MACOSX
+            Name = STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
+	#else
+            Name = STRING(CONCAT6(libaprutil-1,UNXSUFFIX,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO));
+	#endif
+    #endif
+    PACKED_LIB_FILE_BODY;
+End
+
+File gid_File_Lib_Serf
+    #ifdef WNT
+        Name = SPECIAL_NAME(serf);
+    #else
+	// Looks like the major version number is part of the name, not
+	// part of the suffix.  An error?
+	#ifdef MACOSX
+            Name = STRING(CONCAT6(libserf-1,.0.,SERF_MINOR,.,SERF_MICRO,UNXSUFFIX));
+	#else
+            Name = STRING(CONCAT6(libserf-1,UNXSUFFIX,.0.,SERF_MINOR,.,SERF_MICRO));
+	#endif
+    #endif
+    PACKED_LIB_FILE_BODY;
+End
+

Modified: incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk Thu Feb 23 13:29:54 2012
@@ -240,6 +240,21 @@ SCPDEFS+=-DOPENSSL
 SCPDEFS+=-DDISABLE_ATL
 .ENDIF
 
+# Detect version numbers for apr, apr-util, serf.
+.INCLUDE : apr_version.mk
+.INCLUDE : aprutil_version.mk
+.INCLUDE : serf_version.mk
+SCPDEFS+=\
+    -DAPR_MAJOR=$(APR_MAJOR)		\
+    -DAPR_MINOR=$(APR_MINOR)		\
+    -DAPR_MICRO=$(APR_MICRO)		\
+    -DAPR_UTIL_MAJOR=$(APR_UTIL_MAJOR)	\
+    -DAPR_UTIL_MINOR=$(APR_UTIL_MINOR)	\
+    -DAPR_UTIL_MICRO=$(APR_UTIL_MICRO)	\
+    -DSERF_MAJOR=$(SERF_MAJOR)		\
+    -DSERF_MINOR=$(SERF_MINOR)		\
+    -DSERF_MICRO=$(SERF_MICRO)
+
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON
 .ENDIF

Modified: incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp Thu Feb 23 13:29:54 2012
@@ -90,4 +90,45 @@ End
 
 #endif
 
+#ifdef UNX
+
+// Create links to the fully quantified libraries apr, apr-util, and serf.
+// The major version number is handled in a non-standard way (part of the name).
+// Therefore the hard-coded .0 suffix.
+
+Shortcut gid_Shortcut_Lib_Apr
+    FileID = gid_File_Lib_Apr;
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+        Name = STRING(CONCAT2(libapr-1.0,UNXSUFFIX));
+    #else
+        Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.0));
+    #endif
+    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
+End
+
+Shortcut gid_Shortcut_Lib_AprUtil
+    FileID = gid_File_Lib_AprUtil;
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+        Name = STRING(CONCAT2(libaprutil-1.0,UNXSUFFIX));
+    #else
+        Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.0));
+    #endif
+    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
+End
+
+Shortcut gid_Shortcut_Lib_Serf
+    FileID = gid_File_Lib_Serf;
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+        Name = STRING(CONCAT2(libserf-1.0,UNXSUFFIX));
+    #else
+        Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
+    #endif
+    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
+End
+
+#endif
+
 //i44154 -end-

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Thu Feb 23 13:29:54 2012
@@ -1974,16 +1974,12 @@ ToFile( "CURL_LIBS",         "@CURL_LIBS
 ToFile( "SYSTEM_BOOST",      "@SYSTEM_BOOST@",     "e" );
 ToFile( "SYSTEM_MDDS",       "@SYSTEM_MDDS@",      "e" );
 ToFile( "SYSTEM_VIGRA",      "@SYSTEM_VIGRA@",     "e" );
-ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
 ToFile( "SYSTEM_GDKPIXBUF",  "@SYSTEM_GDKPIXBUF@",   "e" );
 ToFile( "SYSTEM_GLIB",       "@SYSTEM_GLIB@",   "e" );
 ToFile( "SYSTEM_GETTEXT",    "@SYSTEM_GETTEXT@",   "e" );
 ToFile( "SYSTEM_PANGO",      "@SYSTEM_PANGO@",   "e" );
 ToFile( "SYSTEM_LIBPNG",     "@SYSTEM_LIBPNG@",   "e" );
 ToFile( "SYSTEM_LIBJPEG",    "@SYSTEM_LIBJPEG@",   "e" );
-ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
-ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
-ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );
 ToFile( "DISABLE_XAW",       "@DISABLE_XAW@",      "e" );
 ToFile( "DMAKE_URL",         "@DMAKE_URL@",        "e" );
 ToFile( "DMAKE_PATH",        "@DMAKE_PATH@",       "e" );

Modified: incubator/ooo/trunk/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/libs.mk?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/libs.mk Thu Feb 23 13:29:54 2012
@@ -350,7 +350,8 @@ MYTHESLIB=-lmythes
 MYTHESLIB=-lmythes-1.2
 .ENDIF
 PYUNOLIB=-lpyuno
-COINMPLIB=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
+COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
+SERFLIBS=-lapr-1 -laprutil-1 -lserf-1
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
@@ -524,7 +525,8 @@ HUNSPELLLIB=$(LIBPRE) libhunspell.lib
 .ENDIF
 MYTHESLIB=libmythes.lib
 PYUNOLIB=ipyuno.lib
-COINMPLIB=CoinMP.lib
+COINMPLIBS=CoinMP.lib
+SERFLIBS=libapr-1.lib iapr-util.lib iserf.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
 TESTLIB=itest.lib

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/ContentProperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/ContentProperties.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/ContentProperties.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/ContentProperties.cxx Thu Feb 23 13:29:54 2012
@@ -31,7 +31,7 @@
  *************************************************************************/
 #include <osl/diagnose.h>
 #include <com/sun/star/util/DateTime.hpp>
-#include "NeonUri.hxx"
+#include "SerfUri.hxx"
 #include "DAVResource.hxx"
 #include "DAVProperties.hxx"
 #include "DateTimeHelper.hxx"
@@ -39,7 +39,7 @@
 #include "ContentProperties.hxx"
 
 using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 
 /*
 =============================================================================
@@ -97,7 +97,7 @@ ContentProperties::ContentProperties( co
     // Title
     try
     {
-        NeonUri aURI( rResource.uri );
+        SerfUri aURI( rResource.uri );
         m_aEscapedTitle = aURI.GetPathBaseName();
 
         (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ]
@@ -564,9 +564,6 @@ void ContentProperties::addProperty( con
                 ? rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE )
                 : rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ) ), true );
     }
-    //  else if ( rName.equals( DAVProperties::SOURCE ) )
-    //  {
-    //  }
     //  else if ( rName.equals( DAVProperties::SUPPORTEDLOCK ) )
     //  {
     //  }

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/ContentProperties.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/ContentProperties.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/ContentProperties.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/ContentProperties.hxx Thu Feb 23 13:29:54 2012
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespac
     struct Property;
 } } } }
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 struct DAVResource;
@@ -218,6 +218,6 @@ public:
     operator const ContentProperties & () const { return m_aProps; }
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif /* !_WEBDAV_UCP_CONTENTPROPERTIES_HXX */

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVAuthListener.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVAuthListener.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVAuthListener.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVAuthListener.hxx Thu Feb 23 13:29:54 2012
@@ -29,7 +29,7 @@
 #include <com/sun/star/uno/XReference.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 class DAVAuthListener : public salhelper::SimpleReferenceObject
@@ -43,6 +43,6 @@ class DAVAuthListener : public salhelper
             sal_Bool bCanUseSystemCredentials ) = 0;
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif // _DAVAUTHLISTENER_HXX_

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx Thu Feb 23 13:29:54 2012
@@ -27,7 +27,7 @@
 #include "DAVAuthListener.hxx"
 
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 //=========================================================================

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVException.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVException.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVException.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVException.hxx Thu Feb 23 13:29:54 2012
@@ -26,7 +26,7 @@
 
 #include <rtl/ustring.hxx>
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 /////////////////////////////////////////////////////////////////////////////
@@ -139,17 +139,24 @@ class DAVException
         sal_uInt16      mStatusCode;
 
     public:
-         DAVException( ExceptionCode inExceptionCode ) :
-            mExceptionCode( inExceptionCode ), mStatusCode( SC_NONE ) {};
+         DAVException( ExceptionCode inExceptionCode ) 
+             : mExceptionCode( inExceptionCode )
+             , mData()
+             , mStatusCode( SC_NONE )
+         {};
          DAVException( ExceptionCode inExceptionCode,
-                       const rtl::OUString & rData ) :
-            mExceptionCode( inExceptionCode ), mData( rData ),
-            mStatusCode( SC_NONE ) {};
+                       const rtl::OUString & rData ) 
+             : mExceptionCode( inExceptionCode )
+             , mData( rData )
+             , mStatusCode( SC_NONE )
+         {};
          DAVException( ExceptionCode inExceptionCode,
                        const rtl::OUString & rData,
-                       sal_uInt16 nStatusCode ) :
-            mExceptionCode( inExceptionCode ), mData( rData ),
-            mStatusCode( nStatusCode ) {};
+                       sal_uInt16 nStatusCode )
+            : mExceptionCode( inExceptionCode )
+            , mData( rData )
+            , mStatusCode( nStatusCode )
+         {};
         ~DAVException( ) {};
 
     const ExceptionCode & getError() const { return mExceptionCode; }
@@ -157,6 +164,6 @@ class DAVException
     sal_uInt16 getStatus() const { return mStatusCode; }
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif // _DAVEXCEPTION_HXX_

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVProperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVProperties.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVProperties.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVProperties.cxx Thu Feb 23 13:29:54 2012
@@ -27,7 +27,7 @@
 #include <string.h>
 #include "DAVProperties.hxx"
 
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 
 const ::rtl::OUString DAVProperties::CREATIONDATE =
                 ::rtl::OUString::createFromAscii( "DAV:creationdate" );
@@ -47,8 +47,6 @@ const ::rtl::OUString DAVProperties::LOC
                 ::rtl::OUString::createFromAscii( "DAV:lockdiscovery" );
 const ::rtl::OUString DAVProperties::RESOURCETYPE =
                 ::rtl::OUString::createFromAscii( "DAV:resourcetype" );
-const ::rtl::OUString DAVProperties::SOURCE =
-                ::rtl::OUString::createFromAscii( "DAV:source" );
 const ::rtl::OUString DAVProperties::SUPPORTEDLOCK =
                 ::rtl::OUString::createFromAscii( "DAV:supportedlock" );
 
@@ -58,8 +56,8 @@ const ::rtl::OUString DAVProperties::EXE
 
 // -------------------------------------------------------------------
 // static
-void DAVProperties::createNeonPropName( const rtl::OUString & rFullName,
-                                        NeonPropName & rName )
+void DAVProperties::createSerfPropName( const rtl::OUString & rFullName,
+                                        SerfPropName & rName )
 {
     if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "DAV:" ) ) == 0 )
     {
@@ -145,9 +143,10 @@ void DAVProperties::createUCBPropName( c
              DAVProperties::GETCONTENTLENGTH.matchIgnoreAsciiCase( aName, 4 ) ||
              DAVProperties::GETCONTENTTYPE.matchIgnoreAsciiCase( aName, 4 ) ||
              DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) ||
-             DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) ||
-             DAVProperties::SOURCE.matchIgnoreAsciiCase( aName, 4 ) )
+             DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) )
+        {
             aNameSpace = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DAV:" ) );
+        }
     }
 
     // Note: Concatenating strings BEFORE comparing against known namespaces
@@ -186,7 +185,7 @@ void DAVProperties::createUCBPropName( c
 
 // -------------------------------------------------------------------
 // static
-bool DAVProperties::isUCBDeadProperty( const NeonPropName & rName )
+bool DAVProperties::isUCBDeadProperty( const SerfPropName & rName )
 {
     return ( rName.nspace &&
              ( rtl_str_compareIgnoreAsciiCase(

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVProperties.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVProperties.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVProperties.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVProperties.hxx Thu Feb 23 13:29:54 2012
@@ -24,9 +24,9 @@
 #define _DAVPROPERTIES_HXX_
 
 #include <rtl/ustring.hxx>
-#include "NeonTypes.hxx"
+#include "SerfTypes.hxx"
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 struct DAVProperties
@@ -40,19 +40,18 @@ struct DAVProperties
 	static const ::rtl::OUString GETLASTMODIFIED;
 	static const ::rtl::OUString LOCKDISCOVERY;
 	static const ::rtl::OUString RESOURCETYPE;
-	static const ::rtl::OUString SOURCE;
 	static const ::rtl::OUString SUPPORTEDLOCK;
 	static const ::rtl::OUString EXECUTABLE;
 
-	static void createNeonPropName( const rtl::OUString & rFullName,
-									NeonPropName & rName );
+	static void createSerfPropName( const rtl::OUString & rFullName,
+									SerfPropName & rName );
 	static void createUCBPropName ( const char * nspace,
 									const char * name,
 									rtl::OUString & rFullName );
 
-	static bool isUCBDeadProperty( const NeonPropName & rName );
+	static bool isUCBDeadProperty( const SerfPropName & rName );
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif // _DAVPROPERTIES_HXX_

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx Thu Feb 23 13:29:54 2012
@@ -27,7 +27,7 @@
 #include <rtl/ref.hxx>
 #include "DAVAuthListener.hxx"
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
     typedef std::pair< rtl::OUString, rtl::OUString > DAVRequestHeader;
     typedef std::vector< DAVRequestHeader > DAVRequestHeaders;
@@ -53,6 +53,6 @@ DAVRequestEnvironment( const rtl::OUStri
     DAVRequestEnvironment() {}
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif // _DAVREQUESTENVIRONMENT_HXX_

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResource.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResource.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResource.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResource.hxx Thu Feb 23 13:29:54 2012
@@ -29,7 +29,7 @@
 #include "rtl/ustring.hxx"
 #include "com/sun/star/uno/Any.hxx"
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 struct DAVPropertyValue
@@ -58,6 +58,6 @@ struct DAVResourceInfo
 	DAVResourceInfo( const ::rtl::OUString & inUri ) : uri( inUri ) {}
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif // _DAVRESOURCE_HXX_

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.cxx Thu Feb 23 13:29:54 2012
@@ -35,7 +35,7 @@
 #include "DAVAuthListenerImpl.hxx"
 #include "DAVResourceAccess.hxx"
 
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 using namespace com::sun::star;
 
 //=========================================================================
@@ -169,48 +169,6 @@ DAVResourceAccess & DAVResourceAccess::o
     return *this;
 }
 
-#if 0 // currently not used, but please don't remove code
-//=========================================================================
-void DAVResourceAccess::OPTIONS(
-    DAVCapabilities & rCapabilities,
-    const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
-{
-    initialize();
-
-    bool bRetry;
-    int errorCount = 0;
-    do
-    {
-        bRetry = false;
-        try
-        {
-            DAVRequestHeaders aHeaders;
-            getUserRequestHeaders( xEnv,
-                                   getRequestURI(),
-                                   rtl::OUString::createFromAscii(
-                                       "OPTIONS" ),
-                                   aHeaders );
-
-            m_xSession->OPTIONS( getRequestURI(),
-                                 rCapabilities,
-                                 DAVRequestEnvironment(
-                                     getRequestURI(),
-                                     new DAVAuthListener_Impl( xEnv, m_aURL ),
-                                     aHeaders, xEnv) );
-        }
-        catch ( DAVException & e )
-        {
-            errorCount++;
-            bRetry = handleException( e, errorCount );
-            if ( !bRetry )
-                throw;
-        }
-    }
-    while ( bRetry );
-}
-#endif
-
 //=========================================================================
 void DAVResourceAccess::PROPFIND(
     const Depth nDepth,
@@ -1056,7 +1014,7 @@ void DAVResourceAccess::initialize()
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     if ( m_aPath.getLength() == 0 )
     {
-        NeonUri aURI( m_aURL );
+        SerfUri aURI( m_aURL );
         rtl::OUString aPath( aURI.GetPath() );
 
         /* #134089# - Check URI */
@@ -1147,10 +1105,10 @@ sal_Bool DAVResourceAccess::detectRedire
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
-    NeonUri aUri( rRedirectURL );
+    SerfUri aUri( rRedirectURL );
 
-    std::vector< NeonUri >::const_iterator it  = m_aRedirectURIs.begin();
-    std::vector< NeonUri >::const_iterator end = m_aRedirectURIs.end();
+    std::vector< SerfUri >::const_iterator it  = m_aRedirectURIs.begin();
+    std::vector< SerfUri >::const_iterator end = m_aRedirectURIs.end();
 
     while ( it != end )
     {
@@ -1169,9 +1127,9 @@ void DAVResourceAccess::resetUri()
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     if ( m_aRedirectURIs.size() > 0 )
     {
-        std::vector< NeonUri >::const_iterator it  = m_aRedirectURIs.begin();
+        std::vector< SerfUri >::const_iterator it  = m_aRedirectURIs.begin();
 
-        NeonUri aUri( (*it) );
+        SerfUri aUri( (*it) );
         m_aRedirectURIs.clear();
         setURL ( aUri.GetURI() );
         initialize();

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx Thu Feb 23 13:29:54 2012
@@ -37,9 +37,9 @@
 #include "DAVSession.hxx"
 #include "DAVResource.hxx"
 #include "DAVTypes.hxx"
-#include "NeonUri.hxx"
+#include "SerfUri.hxx"
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 class DAVSessionFactory;
@@ -53,7 +53,7 @@ class DAVResourceAccess
     rtl::Reference< DAVSessionFactory > m_xSessionFactory;
     com::sun::star::uno::Reference<
         com::sun::star::lang::XMultiServiceFactory > m_xSMgr;
-    std::vector< NeonUri > m_aRedirectURIs;
+    std::vector< SerfUri > m_aRedirectURIs;
 
 public:
     DAVResourceAccess() : m_xSessionFactory( 0 ) {}
@@ -79,14 +79,6 @@ public:
     // DAV methods
     //
 
-#if 0 // currently not used, but please don't remove code
-    void
-    OPTIONS(  DAVCapabilities & rCapabilities,
-              const com::sun::star::uno::Reference<
-                  com::sun::star::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
-#endif
-
     // allprop & named
     void
     PROPFIND( const Depth nDepth,
@@ -242,6 +234,6 @@ private:
         throw ( DAVException );
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif // _DAVRESOURCEACCESS_HXX_

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSession.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSession.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSession.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSession.hxx Thu Feb 23 13:29:54 2012
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespac
     struct Lock;
 } } } }
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 class DAVAuthListener;
@@ -68,10 +68,13 @@ public:
     // DAV methods
     //
 
+    // NOT USED
+    /*
     virtual void OPTIONS( const ::rtl::OUString & inPath,
                           DAVCapabilities & outCapabilities,
                           const DAVRequestEnvironment & rEnv )
         throw( DAVException ) = 0;
+    */
 
     // allprop & named
     virtual void PROPFIND( const ::rtl::OUString & inPath,
@@ -210,6 +213,6 @@ private:
 #endif // WNT
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif // _DAVSESSION_HXX_

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSessionFactory.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSessionFactory.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSessionFactory.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSessionFactory.cxx Thu Feb 23 13:29:54 2012
@@ -24,11 +24,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_ucb.hxx"
 #include "DAVSessionFactory.hxx"
-#include "NeonSession.hxx"
-#include "NeonUri.hxx"
+#include "SerfSession.hxx"
+#include "SerfUri.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 using namespace com::sun::star;
 
 DAVSessionFactory::~DAVSessionFactory()
@@ -60,10 +60,10 @@ rtl::Reference< DAVSession > DAVSessionF
 
     if ( aIt == aEnd )
     {
-        NeonUri aURI( inUri );
+        SerfUri aURI( inUri );
 
         std::auto_ptr< DAVSession > xElement(
-            new NeonSession( this, inUri, *m_xProxyDecider.get() ) );
+            new SerfSession( this, inUri, *m_xProxyDecider.get() ) );
 
         aIt = m_aMap.insert( Map::value_type( inUri, xElement.get() ) ).first;
         aIt->second->m_aContainerIt = aIt;
@@ -84,9 +84,9 @@ rtl::Reference< DAVSession > DAVSessionF
         // If URL scheme is different from http or https we definitely
         // have to use a proxy and therefore can optimize the getProxy
         // call a little:
-        NeonUri aURI( inUri );
+        SerfUri aURI( inUri );
 
-        aIt->second = new NeonSession( this, inUri, *m_xProxyDecider.get() );
+        aIt->second = new SerfSession( this, inUri, *m_xProxyDecider.get() );
         aIt->second->m_aContainerIt = aIt;
         return aIt->second;
     }

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSessionFactory.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSessionFactory.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSessionFactory.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVSessionFactory.hxx Thu Feb 23 13:29:54 2012
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespac
 	class XMultiServiceFactory;
 } } } }
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 class DAVSession;
@@ -73,6 +73,6 @@ private:
     friend class DAVSession;
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif // _DAVSESSIONFACTORY_HXX_

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVTypes.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVTypes.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVTypes.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DAVTypes.hxx Thu Feb 23 13:29:54 2012
@@ -27,7 +27,7 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 /* RFC 2518
 
@@ -76,6 +76,6 @@ struct ProppatchValue
 	: operation( o ), name( n ), value( v ) {}
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif // _DAVTYPES_HXX_

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DateTimeHelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DateTimeHelper.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DateTimeHelper.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DateTimeHelper.cxx Thu Feb 23 13:29:54 2012
@@ -32,7 +32,7 @@
 using namespace com::sun::star::util;
 using namespace rtl;
 
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 
 bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s,
 	DateTime& dateTime)

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/DateTimeHelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/DateTimeHelper.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/DateTimeHelper.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/DateTimeHelper.hxx Thu Feb 23 13:29:54 2012
@@ -34,7 +34,7 @@ namespace rtl {
 	class OUString;
 }
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 class DateTimeHelper
@@ -53,7 +53,7 @@ public:
 		::com::sun::star::util::DateTime& );
 };
 
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
 
 #endif
 

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/PropertyMap.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/PropertyMap.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/PropertyMap.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/PropertyMap.hxx Thu Feb 23 13:29:54 2012
@@ -27,7 +27,7 @@
 #include <hash_set>
 #include <com/sun/star/beans/Property.hpp>
 
-namespace webdav_ucp {
+namespace http_dav_ucp {
 
 //=========================================================================
 

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx Thu Feb 23 13:29:54 2012
@@ -25,12 +25,12 @@
 #include "precompiled_ucb.hxx"
 
 #include <string.h>
-#include <ne_xml.h>
+//#include <ne_xml.h>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include "UCBDeadPropertyValue.hxx"
 
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 using namespace com::sun::star;
 
 //////////////////////////////////////////////////////////////////////////
@@ -78,11 +78,12 @@ const rtl::OUString UCBDeadPropertyValue
 #define STATE_TYPE      (STATE_TOP + 1)
 #define STATE_VALUE     (STATE_TOP + 2)
 
+/*
 //////////////////////////////////////////////////////////////////////////
 extern "C" int UCBDeadPropertyValue_startelement_callback(
     void *,
     int parent,
-    const char * /*nspace*/,
+    const char * nspace,
     const char *name,
     const char ** )
 {
@@ -166,6 +167,7 @@ extern "C" int UCBDeadPropertyValue_ende
     }
     return 0; // zero to continue, non-zero to abort parsing
 }
+*/
 
 //////////////////////////////////////////////////////////////////////////
 static rtl::OUString encodeValue( const rtl::OUString & rValue )
@@ -352,11 +354,12 @@ bool UCBDeadPropertyValue::supportsType(
 
 //////////////////////////////////////////////////////////////////////////
 // static
-bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData,
-                                          uno::Any & rOutData )
+bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/,
+                                          uno::Any & /*rOutData*/ )
 {
     bool success = false;
 
+    /*
     ne_xml_parser * parser = ne_xml_create();
     if ( parser )
     {
@@ -431,7 +434,7 @@ bool UCBDeadPropertyValue::createFromXML
                 success = false;
         }
     }
-
+    */
     return success;
 }
 
@@ -529,11 +532,10 @@ bool UCBDeadPropertyValue::toXML( const 
     // Encode value! It must not contain XML reserved chars!
     aStringValue = encodeValue( aStringValue );
 
-        rOutData =  aXMLPre;
+    rOutData =  aXMLPre;
     rOutData += aStringType;
     rOutData += aXMLMid;
     rOutData += aStringValue;
     rOutData += aXMLEnd;
-
     return true;
 }

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx Thu Feb 23 13:29:54 2012
@@ -27,7 +27,7 @@
 #include <rtl/string.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 class UCBDeadPropertyValue

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk Thu Feb 23 13:29:54 2012
@@ -1,25 +1,29 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you 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.
-#  
-#**************************************************************
-
-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
 
 # UCP Version - Increase, if UCP libraray becomes incompatible.
 UCP_VERSION=1
@@ -44,25 +48,45 @@ NO_BSYMBOLIC=TRUE
 .INCLUDE: settings.mk
 .IF "$(L10N_framework)"==""
 
-.IF "$(SYSTEM_NEON)" != "YES"
-
-@all:
-    @echo "no system neon is used...."
+APRINCDIR=apr
+APRUTILINCDIR=apr-util
+SERFINCDIR=serf
+
+#.IF "$(SYSTEM_APR)" != "YES"
+#.INCLUDE: $(SOLARINCDIR)$/$(APRINCDIR)$/version.mk
+#.ENDIF
+#.IF "$(SYSTEM_APRUTIL)" != "YES"
+#.INCLUDE: $(SOLARINCDIR)$/$(APRUTILINCDIR)$/version.mk
+#.ENDIF
+#.IF "$(SYSTEM_SERF)" != "YES"
+#.INCLUDE: $(SOLARINCDIR)$/$(SERFINCDIR)$/version.mk
+#.ENDIF
+
+#CFLAGS+= -DAPR_VERSION=0x$(APR_VERSION) -DAPRUTIL_VERSION=0x$(APRUTIL_VERSION) -DSERF_VERSION=0x$(SERF_VERSION)
+
+#
+# Extend the list of include paths depending on whether we use locally built
+# or system versions of libraries apr, apr-util, serf, libxml
+#
+# We have to use CFLAGS for this because PRJINC is too inflexible (it adds /inc to everyting.)
+#
 
+.IF "$(SYSTEM_APR)" == "YES"
+CFLAGS+= $(APR_CFLAGS)
 .ELSE
-
-NEONINCDIR=external$/neon
-
-.IF "$(SYSTEM_NEON)" != "YES"
-.INCLUDE: $(SOLARINCDIR)$/$(NEONINCDIR)$/version.mk
+CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR)
 .ENDIF
 
-CFLAGS+= -DNEON_VERSION=0x$(NEON_VERSION)
+.IF "$(SYSTEM_APRUTIL)" == "YES"
+CFLAGS+= $(APRUTIL_CFLAGS)
+.ELSE
+CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR)
+.ENDIF
 
-.IF "$(SYSTEM_NEON)" == "YES"
-CFLAGS+= $(NEON_CFLAGS)
+.IF "$(SYSTEM_SERF)" == "YES"
+CFLAGS+= $(SERF_CFLAGS)
 .ELSE
-CFLAGS+= -I$(SOLARINCDIR)$/$(NEONINCDIR)
+CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR)
 .ENDIF
 
 .IF "$(SYSTEM_LIBXML)" == "YES"
@@ -73,7 +97,7 @@ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDI
 .ENDIF
 
 .IF "$(SYSTEM_OPENSSL)" == "YES"
-CFLAGS+= $(OPENSSL_CFLAGS)
+CFLAGS+= -I$(OPENSSL_CFLAGS)
 .ENDIF
 
 # --- General -----------------------------------------------------
@@ -89,16 +113,26 @@ SLOFILES=\
     $(SLO)$/DAVProperties.obj \
     $(SLO)$/DAVSessionFactory.obj \
     $(SLO)$/DAVResourceAccess.obj \
-    $(SLO)$/NeonUri.obj \
-    $(SLO)$/NeonInputStream.obj \
-    $(SLO)$/NeonPropFindRequest.obj \
-    $(SLO)$/NeonHeadRequest.obj \
-    $(SLO)$/NeonSession.obj \
-    $(SLO)$/NeonLockStore.obj \
+    $(SLO)$/AprEnv.obj \
+    $(SLO)$/webdavresponseparser.obj \
+    $(SLO)$/SerfUri.obj \
+    $(SLO)$/SerfRequestProcessor.obj \
+    $(SLO)$/SerfRequestProcessorImpl.obj \
+    $(SLO)$/SerfRequestProcessorImplFac.obj \
+    $(SLO)$/SerfPropFindReqProcImpl.obj \
+    $(SLO)$/SerfPropPatchReqProcImpl.obj \
+    $(SLO)$/SerfGetReqProcImpl.obj \
+    $(SLO)$/SerfHeadReqProcImpl.obj \
+    $(SLO)$/SerfPutReqProcImpl.obj \
+    $(SLO)$/SerfPostReqProcImpl.obj \
+    $(SLO)$/SerfDeleteReqProcImpl.obj \
+    $(SLO)$/SerfMkColReqProcImpl.obj \
+    $(SLO)$/SerfCopyReqProcImpl.obj \
+    $(SLO)$/SerfMoveReqProcImpl.obj \
+    $(SLO)$/SerfSession.obj \
+    $(SLO)$/SerfCallbacks.obj \
+    $(SLO)$/SerfInputStream.obj \
     $(SLO)$/DateTimeHelper.obj \
-    $(SLO)$/LinkSequence.obj \
-    $(SLO)$/LockSequence.obj \
-    $(SLO)$/LockEntrySequence.obj \
     $(SLO)$/UCBDeadPropertyValue.obj
 
 LIB1TARGET=$(SLB)$/_$(TARGET).lib
@@ -118,7 +152,7 @@ SHL1STDLIBS=\
         $(SALHELPERLIB)  \
         $(UCBHELPERLIB)  \
         $(COMPHELPERLIB) \
-        $(NEON3RDLIB)    \
+		$(SERFLIBS)      \
         $(LIBXML2LIB)
 
 .IF "$(GUI)"=="WNT"
@@ -148,8 +182,6 @@ SHL1LIBS=$(LIB1TARGET)
 
 DEF1NAME=$(SHL1TARGET)
 
-.ENDIF #"$(DISABLE_NEON)" == "TRUE"
-
 .ENDIF # L10N_framework
 # --- Targets ----------------------------------------------------------
 

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/ucpdav1.component
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/ucpdav1.component?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/ucpdav1.component (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/ucpdav1.component Thu Feb 23 13:29:54 2012
@@ -1,26 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- * 
- ***********************************************************-->
-
-
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org 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 Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
 
 <component loader="com.sun.star.loader.SharedLibrary"
     xmlns="http://openoffice.org/2010/uno-components">

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx Thu Feb 23 13:29:54 2012
@@ -81,11 +81,11 @@
 #include "webdavprovider.hxx"
 #include "webdavresultset.hxx"
 #include "ContentProperties.hxx"
-#include "NeonUri.hxx"
+#include "SerfUri.hxx"
 #include "UCBDeadPropertyValue.hxx"
 
 using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 
 //=========================================================================
 //=========================================================================
@@ -117,7 +117,7 @@ Content::Content(
                 rSessionFactory,
                 Identifier->getContentIdentifier() ) );
 
-        NeonUri aURI( Identifier->getContentIdentifier() );
+        SerfUri aURI( Identifier->getContentIdentifier() );
         m_aEscapedTitle = aURI.GetPathBaseName();
     }
     catch ( DAVException const & )
@@ -803,7 +803,6 @@ void SAL_CALL Content::addProperty( cons
                     case DAV:
                         throw lang::IllegalArgumentException();
 
-                    case FTP:
                     case NON_DAV:
                         // Store property locally.
                         ContentImplHelper::addProperty( Name,
@@ -920,7 +919,6 @@ void SAL_CALL Content::removeProperty( c
                         case DAV:
                             throw beans::UnknownPropertyException();
 
-                        case FTP:
                         case NON_DAV:
                             // Try to remove property from local store.
                             ContentImplHelper::removeProperty( Name );
@@ -1038,7 +1036,7 @@ Content::createNewContent( const ucb::Co
     // create the local content
     try
     {
-        return new ::webdav_ucp::Content( m_xSMgr,
+        return new ::http_dav_ucp::Content( m_xSMgr,
                                           m_pProvider,
                                           xId,
                                           m_xResAccess->getSessionFactory(),
@@ -1188,7 +1186,7 @@ uno::Reference< sdbc::XRow > Content::ge
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
-        aUnescapedTitle = NeonUri::unescape( m_aEscapedTitle );
+        aUnescapedTitle = SerfUri::unescape( m_aEscapedTitle );
         xSMgr.set( m_xSMgr );
         xIdentifier.set( m_xIdentifier );
         xProvider.set( m_xProvider.get() );
@@ -1381,7 +1379,7 @@ uno::Reference< sdbc::XRow > Content::ge
 
         // might trigger HTTP redirect.
         // Therefore, title must be updated here.
-        NeonUri aUri( xResAccess->getURL() );
+        SerfUri aUri( xResAccess->getURL() );
         aUnescapedTitle = aUri.GetPathBaseNameUnescaped();
 
         if ( rType == UNKNOWN )
@@ -1477,7 +1475,7 @@ uno::Reference< sdbc::XRow > Content::ge
             m_xCachedProps->addProperties( *xProps.get() );
 
         m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
-        m_aEscapedTitle = NeonUri::escapeSegment( aUnescapedTitle );
+        m_aEscapedTitle = SerfUri::escapeSegment( aUnescapedTitle );
     }
 
     return xResultRow;
@@ -1590,7 +1588,7 @@ uno::Sequence< uno::Any > Content::setPr
                 {
                     try
                     {
-                        NeonUri aURI( xIdentifier->getContentIdentifier() );
+                        SerfUri aURI( xIdentifier->getContentIdentifier() );
                         aOldTitle = aURI.GetPathBaseNameUnescaped();
 
                         if ( aNewValue != aOldTitle )
@@ -1829,7 +1827,7 @@ uno::Sequence< uno::Any > Content::setPr
         if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) )
             aNewURL += rtl::OUString::createFromAscii( "/" );
 
-        aNewURL += NeonUri::escapeSegment( aNewTitle );
+        aNewURL += SerfUri::escapeSegment( aNewTitle );
 
         uno::Reference< ucb::XContentIdentifier > xNewId
             = new ::ucbhelper::ContentIdentifier( xSMgr, aNewURL );
@@ -1837,8 +1835,8 @@ uno::Sequence< uno::Any > Content::setPr
 
         try
         {
-            NeonUri sourceURI( xOldId->getContentIdentifier() );
-            NeonUri targetURI( xNewId->getContentIdentifier() );
+            SerfUri sourceURI( xOldId->getContentIdentifier() );
+            SerfUri targetURI( xNewId->getContentIdentifier() );
             targetURI.SetScheme( sourceURI.GetScheme() );
 
             xResAccess->MOVE(
@@ -1892,7 +1890,7 @@ uno::Sequence< uno::Any > Content::setPr
         aEvent.OldValue     = uno::makeAny( aOldTitle );
         aEvent.NewValue     = uno::makeAny( aNewTitle );
 
-        m_aEscapedTitle     = NeonUri::escapeSegment( aNewTitle );
+        m_aEscapedTitle     = SerfUri::escapeSegment( aNewTitle );
 
         aChanges.getArray()[ nChanged ] = aEvent;
         nChanged++;
@@ -1938,17 +1936,8 @@ uno::Any Content::open(
             // Error: Not a folder!
 
             rtl::OUStringBuffer aMsg;
-            if ( getResourceType( xEnv ) == FTP )
-            {
-                // #114653#
-                aMsg.appendAscii( "FTP over HTTP proxy: resource cannot "
-                                  "be opened as folder! Wrong Open Mode!" );
-            }
-            else
-            {
-                aMsg.appendAscii( "Non-folder resource cannot be "
-                                  "opened as folder! Wrong Open Mode!" );
-            }
+            aMsg.appendAscii( "Non-folder resource cannot be "
+                              "opened as folder! Wrong Open Mode!" );
 
             ucbhelper::cancelCommandExecution(
                 uno::makeAny(
@@ -2217,8 +2206,8 @@ void Content::queryChildren( ContentRefL
             {
                 // No further slashes / only a final slash. It's a child!
                 rChildren.push_back(
-                    ::webdav_ucp::Content::ContentRef(
-                        static_cast< ::webdav_ucp::Content * >(
+                    ::http_dav_ucp::Content::ContentRef(
+                        static_cast< ::http_dav_ucp::Content * >(
                             xChild.get() ) ) );
             }
         }
@@ -2283,9 +2272,9 @@ void Content::insert(
         // ==> Complain on PUT, continue on MKCOL.
         if ( !bTransient || ( bTransient && !bCollection  ) )
         {
+#undef ERROR
             ucb::UnsupportedNameClashException aEx(
-                rtl::OUString::createFromAscii(
-                    "Unable to write without overwrite!" ),
+                rtl::OUString::createFromAscii( "Unable to write without overwrite!" ),
                 static_cast< cppu::OWeakObject * >( this ),
                 ucb::NameClash::ERROR );
 
@@ -2405,7 +2394,7 @@ void Content::insert(
                         rtl::OUString aTitle;
                         try
                         {
-                            NeonUri aURI( aURL );
+                            SerfUri aURI( aURL );
                             aTitle = aURI.GetPathBaseNameUnescaped();
                         }
                         catch ( DAVException const & )
@@ -2495,8 +2484,8 @@ void Content::transfer(
     rtl::OUString aTargetURI;
     try
     {
-        NeonUri sourceURI( rArgs.SourceURL );
-        NeonUri targetURI( xIdentifier->getContentIdentifier() );
+        SerfUri sourceURI( rArgs.SourceURL );
+        SerfUri targetURI( xIdentifier->getContentIdentifier() );
         aTargetURI = targetURI.GetPathBaseNameUnescaped();
 
         // Check source's and target's URL scheme
@@ -2675,7 +2664,7 @@ void Content::transfer(
         {
             switch ( rArgs.NameClash )
             {
-                case ucb::NameClash::ERROR:
+                case 0/*ucb::NameClash::ERROR*/:
                 {
                     ucbhelper::cancelCommandExecution(
                         uno::makeAny(
@@ -2733,7 +2722,7 @@ void Content::destroy( sal_Bool bDeleteP
 
     // Process instanciated children...
 
-    ::webdav_ucp::Content::ContentRefList aChildren;
+    ::http_dav_ucp::Content::ContentRefList aChildren;
     queryChildren( aChildren );
 
     ContentRefList::const_iterator it  = aChildren.begin();
@@ -3190,58 +3179,51 @@ const Content::ResourceType & Content::g
         const rtl::OUString aScheme(
             rURL.copy( 0, rURL.indexOf( ':' ) ).toAsciiLowerCase() );
 
-        if ( aScheme.equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) ) )
+        try
         {
-            eResourceType = FTP;
+            // Try to fetch some frequently used property value, e.g. those
+            // used when loading documents... along with identifying whether
+            // this is a DAV resource.
+            std::vector< DAVResource > resources;
+            std::vector< rtl::OUString > aPropNames;
+            uno::Sequence< beans::Property > aProperties( 5 );
+            aProperties[ 0 ].Name
+                = rtl::OUString::createFromAscii( "IsFolder" );
+            aProperties[ 1 ].Name
+                = rtl::OUString::createFromAscii( "IsDocument" );
+            aProperties[ 2 ].Name
+                = rtl::OUString::createFromAscii( "IsReadOnly" );
+            aProperties[ 3 ].Name
+                = rtl::OUString::createFromAscii( "MediaType" );
+            aProperties[ 4 ].Name
+                = DAVProperties::SUPPORTEDLOCK;
+
+            ContentProperties::UCBNamesToDAVNames(
+                aProperties, aPropNames );
+
+            rResAccess->PROPFIND(
+                DAVZERO, aPropNames, resources, xEnv );
+
+            // TODO - is this really only one?
+            if ( resources.size() == 1 )
+            {
+                m_xCachedProps.reset(
+                    new CachableContentProperties( resources[ 0 ] ) );
+                m_xCachedProps->containsAllNames(
+                    aProperties, m_aFailedPropNames );
+            }
+
+            eResourceType = DAV;
         }
-        else
+        catch ( DAVException const & e )
         {
-            try
-            {
-                // Try to fetch some frequently used property value, e.g. those
-                // used when loading documents... along with identifying whether
-                // this is a DAV resource.
-                std::vector< DAVResource > resources;
-                std::vector< rtl::OUString > aPropNames;
-                uno::Sequence< beans::Property > aProperties( 5 );
-                aProperties[ 0 ].Name
-                    = rtl::OUString::createFromAscii( "IsFolder" );
-                aProperties[ 1 ].Name
-                    = rtl::OUString::createFromAscii( "IsDocument" );
-                aProperties[ 2 ].Name
-                    = rtl::OUString::createFromAscii( "IsReadOnly" );
-                aProperties[ 3 ].Name
-                    = rtl::OUString::createFromAscii( "MediaType" );
-                aProperties[ 4 ].Name
-                    = DAVProperties::SUPPORTEDLOCK;
-
-                ContentProperties::UCBNamesToDAVNames(
-                    aProperties, aPropNames );
-
-                rResAccess->PROPFIND(
-                    DAVZERO, aPropNames, resources, xEnv );
-
-                if ( resources.size() == 1 )
-                {
-                    m_xCachedProps.reset(
-                        new CachableContentProperties( resources[ 0 ] ) );
-                    m_xCachedProps->containsAllNames(
-                        aProperties, m_aFailedPropNames );
-                }
+            rResAccess->resetUri();
 
-                eResourceType = DAV;
-            }
-            catch ( DAVException const & e )
+            if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
             {
-                rResAccess->resetUri();
-
-                if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
-                {
-                    // Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
-                    // resource is NON_DAV
-                    eResourceType = NON_DAV;
-                }
+                // Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
+                // resource is NON_DAV
+                eResourceType = NON_DAV;
             }
         }
         m_eResourceType = eResourceType;

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontent.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontent.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontent.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontent.hxx Thu Feb 23 13:29:54 2012
@@ -52,7 +52,7 @@ namespace com { namespace sun { namespac
     struct TransferInfo;
 } } } }
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 //=========================================================================
@@ -72,7 +72,6 @@ class Content : public ::ucbhelper::Cont
     enum ResourceType
     {
         UNKNOWN,
-        FTP,
         NON_DAV,
         DAV
     };

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontentcaps.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontentcaps.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontentcaps.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavcontentcaps.cxx Thu Feb 23 13:29:54 2012
@@ -41,7 +41,6 @@
 #include <com/sun/star/ucb/TransferInfo.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/ucb/Link.hpp>
 #include <com/sun/star/ucb/Lock.hpp>
 #include <com/sun/star/ucb/LockEntry.hpp>
 #include "webdavcontent.hxx"
@@ -50,7 +49,7 @@
 #include "ContentProperties.hxx"
 
 using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 
 //=========================================================================
 //
@@ -236,14 +235,6 @@ bool ContentProvider::getProperty(
 
             m_pProps->insert(
                 beans::Property(
-                    DAVProperties::SOURCE,
-                    -1,
-                    getCppuType( static_cast<
-                                    const uno::Sequence< ucb::Link > * >( 0 ) ),
-                    beans::PropertyAttribute::BOUND ) );
-
-            m_pProps->insert(
-                beans::Property(
                     DAVProperties::SUPPORTEDLOCK,
                     -1,
                     getCppuType( static_cast<

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavdatasupplier.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavdatasupplier.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavdatasupplier.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavdatasupplier.cxx Thu Feb 23 13:29:54 2012
@@ -39,12 +39,12 @@
 #ifndef _WEBDAV_SESSION_HXX
 #include "DAVSession.hxx"
 #endif
-#include "NeonUri.hxx"
+#include "SerfUri.hxx"
 
 using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 
-namespace webdav_ucp
+namespace http_dav_ucp
 {
 
 //=========================================================================
@@ -399,7 +399,7 @@ sal_Bool DataSupplier::getData()
         {
             try
             {
-                NeonUri aURI( 
+                SerfUri aURI( 
                     m_pImpl->m_xContent->getResourceAccess().getURL() );
                 rtl::OUString aPath = aURI.GetPath();
 
@@ -407,7 +407,7 @@ sal_Bool DataSupplier::getData()
                      == sal_Unicode( '/' ) )
                     aPath = aPath.copy( 0, aPath.getLength() - 1 );
 
-                aPath = NeonUri::unescape( aPath );
+                aPath = SerfUri::unescape( aPath );
                 bool bFoundParent = false;
 
                 for ( sal_uInt32 n = 0; n < resources.size(); ++n )
@@ -420,7 +420,7 @@ sal_Bool DataSupplier::getData()
                     {
                         try
                         {
-                            NeonUri aCurrURI( rRes.uri );
+                            SerfUri aCurrURI( rRes.uri );
                             rtl::OUString aCurrPath = aCurrURI.GetPath();
                             if ( aCurrPath.getStr()[ 
                                      aCurrPath.getLength() - 1 ] 
@@ -430,7 +430,7 @@ sal_Bool DataSupplier::getData()
                                         0, 
                                         aCurrPath.getLength() - 1 );
 
-                            aCurrPath = NeonUri::unescape( aCurrPath );
+                            aCurrPath = SerfUri::unescape( aCurrPath );
                             if ( aPath == aCurrPath )
                             {
                                 bFoundParent = true;

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavdatasupplier.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavdatasupplier.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavdatasupplier.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavdatasupplier.hxx Thu Feb 23 13:29:54 2012
@@ -28,7 +28,7 @@
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultset.hxx>
 
-namespace webdav_ucp {
+namespace http_dav_ucp {
 
 struct DataSupplier_Impl;
 class Content;

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx Thu Feb 23 13:29:54 2012
@@ -36,7 +36,7 @@
 #include "osl/mutex.hxx"
 
 using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 
 //=========================================================================
 //=========================================================================
@@ -130,9 +130,7 @@ ContentProvider::queryContent(
          !aScheme.equalsAsciiL(
             RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) &&
          !aScheme.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) &&
-          !aScheme.equalsAsciiL(
-             RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) )       )
+            RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
         throw ucb::IllegalIdentifierException();
 
 	// Normalize URL and create new Id, if nessacary.
@@ -211,7 +209,7 @@ ContentProvider::queryContent(
 
 	try
 	{
-        xContent = new ::webdav_ucp::Content(
+        xContent = new ::http_dav_ucp::Content(
                         m_xSMgr, this, xCanonicId, m_xDAVSessionFactory );
         registerNewContent( xContent );
 	}

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavprovider.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavprovider.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavprovider.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavprovider.hxx Thu Feb 23 13:29:54 2012
@@ -30,7 +30,7 @@
 #include <ucbhelper/providerhelper.hxx>
 #include "PropertyMap.hxx"
 
-namespace webdav_ucp {
+namespace http_dav_ucp {
 
 //=========================================================================
 
@@ -59,10 +59,6 @@ namespace webdav_ucp {
 #define DAVS_URL_SCHEME		"davs"
 #define DAVS_URL_SCHEME_LENGTH	4	 
 
-
-
-#define FTP_URL_SCHEME "ftp"
-
 #define HTTP_CONTENT_TYPE \
 				"application/" HTTP_URL_SCHEME "-content"
 

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresultset.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresultset.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresultset.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresultset.cxx Thu Feb 23 13:29:54 2012
@@ -38,7 +38,7 @@
 #endif
 
 using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
 
 //=========================================================================
 //=========================================================================

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresultset.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresultset.hxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresultset.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavresultset.hxx Thu Feb 23 13:29:54 2012
@@ -29,7 +29,7 @@
 #include "webdavcontent.hxx"
 #include "webdavdatasupplier.hxx"
 
-namespace webdav_ucp {
+namespace http_dav_ucp {
 
 class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
 {

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavservices.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavservices.cxx?rev=1292794&r1=1292793&r2=1292794&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavservices.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/webdavservices.cxx Thu Feb 23 13:29:54 2012
@@ -52,10 +52,10 @@ extern "C" void * SAL_CALL component_get
 	// WebDAV Content Provider.
 	//////////////////////////////////////////////////////////////////////
 
-	if ( ::webdav_ucp::ContentProvider::getImplementationName_Static().
+	if ( ::http_dav_ucp::ContentProvider::getImplementationName_Static().
 				compareToAscii( pImplName ) == 0 )
 	{
-		xFactory = ::webdav_ucp::ContentProvider::createServiceFactory( xSMgr );
+		xFactory = ::http_dav_ucp::ContentProvider::createServiceFactory( xSMgr );
 	}
 
 	//////////////////////////////////////////////////////////////////////



Mime
View raw message