#83365# Added RemoteContentBroker service (i.e., the Webserver's UCB that runs in a C++ process).

2 files changed, 31 insertions, 6 deletions

diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk
index 4d0b9bed2b58..6507aacbb97a 100644
--- a/ucb/source/core/makefile.mk
+++ b/ucb/source/core/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: kso $ $Date: 2001-02-06 10:54:45 $
+#   last change: $Author: sb $ $Date: 2001-02-06 11:07:19 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -80,7 +80,8 @@ SLOFILES=\
     $(SLO)$/ucbstore.obj \
     $(SLO)$/ucbprops.obj \
     $(SLO)$/provprox.obj \
-    $(SLO)$/ucbcmds.obj
+    $(SLO)$/ucbcmds.obj \
+    $(SLO)$/coreremotecontentbroker.obj
 
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
 .IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 8c69578a6cd4..10eab23d835a 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ucbserv.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kso $ $Date: 2001-02-06 10:55:37 $
+ *  last change: $Author: sb $ $Date: 2001-02-06 11:07:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,11 +81,15 @@
 #ifndef _PROVPROX_HXX
 #include "provprox.hxx"
 #endif
+#ifndef INCLUDED_UCB_COREREMOTECONTENTBROKER_HXX
+#include "coreremotecontentbroker.hxx"
+#endif
 
 using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
+using ucb_core::RemoteContentBroker;
 
 //=========================================================================
 static sal_Bool writeInfo( void * pRegistryKey,
@@ -169,7 +173,16 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
 
     writeInfo( pRegistryKey,
        UcbContentProviderProxyFactory::getImplementationName_Static(),
-       UcbContentProviderProxyFactory::getSupportedServiceNames_Static() );
+       UcbContentProviderProxyFactory::getSupportedServiceNames_Static() ) &&
+
+    //////////////////////////////////////////////////////////////////////
+    // Remote Content Broker.
+    //////////////////////////////////////////////////////////////////////
+    // THIS CAN BE REMOVED ONCE THE WEBTOP SERVER HAS A UCB OF ITS OWN:
+
+    writeInfo( pRegistryKey,
+               RemoteContentBroker::getImplementationName_Static(),
+               RemoteContentBroker::getSupportedServiceNames_Static() );
 }
 
 //=========================================================================
@@ -224,6 +237,17 @@ extern "C" void * SAL_CALL component_getFactory(
     }
 
     //////////////////////////////////////////////////////////////////////
+    // Remote Content Broker.
+    //////////////////////////////////////////////////////////////////////
+    // THIS CAN BE REMOVED ONCE THE WEBTOP SERVER HAS A UCB OF ITS OWN:
+
+    else if ( RemoteContentBroker::getImplementationName_Static().
+                compareToAscii( pImplName ) == 0 )
+    {
+        xFactory = RemoteContentBroker::createServiceFactory( xSMgr );
+    }
+
+    //////////////////////////////////////////////////////////////////////
 
     if ( xFactory.is() )
     {