jl160 #i114794# registration data folder of bundled extensions in the user installation references PREREG registration data in brand/share/prereg/bundled folder

3 files changed, 129 insertions, 39 deletions

diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index c82973f1b680..492bab566aeb 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -152,12 +152,8 @@ ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& x
     ::cppu::WeakComponentImplHelper1< css::deployment::XExtensionManager >(getMutex()),
     m_xContext( xContext )
 {
-    Reference<deploy::XPackageManagerFactory> xPackageManagerFactory(
-        deploy::thePackageManagerFactory::get(m_xContext));
-    m_userRepository = xPackageManagerFactory->getPackageManager(OUSTR("user"));
-    m_sharedRepository = xPackageManagerFactory->getPackageManager(OUSTR("shared"));
-    m_bundledRepository = xPackageManagerFactory->getPackageManager(OUSTR("bundled"));
-    m_tmpRepository =  xPackageManagerFactory->getPackageManager(OUSTR("tmp"));
+    m_xPackageManagerFactory = deploy::thePackageManagerFactory::get(m_xContext);
+    OSL_ASSERT(m_xPackageManagerFactory.is());
 
     m_repositoryNames.push_back(OUSTR("user"));
     m_repositoryNames.push_back(OUSTR("shared"));
@@ -170,6 +166,23 @@ ExtensionManager::~ExtensionManager()
 {
 }
 
+Reference<deploy::XPackageManager> ExtensionManager::getUserRepository()
+{
+    return m_xPackageManagerFactory->getPackageManager(OUSTR("user"));
+}
+Reference<deploy::XPackageManager>  ExtensionManager::getSharedRepository()
+{
+    return m_xPackageManagerFactory->getPackageManager(OUSTR("shared"));
+}
+Reference<deploy::XPackageManager>  ExtensionManager::getBundledRepository()
+{
+    return m_xPackageManagerFactory->getPackageManager(OUSTR("bundled"));
+}
+Reference<deploy::XPackageManager>  ExtensionManager::getTmpRepository()
+{
+    return m_xPackageManagerFactory->getPackageManager(OUSTR("tmp"));
+}
+
 Reference<task::XAbortChannel> ExtensionManager::createAbortChannel()
     throw (uno::RuntimeException)
 {
@@ -182,11 +195,11 @@ ExtensionManager::getPackageManager(::rtl::OUString const & repository)
 {
     Reference<deploy::XPackageManager> xPackageManager;
     if (repository.equals(OUSTR("user")))
-        xPackageManager = m_userRepository;
+        xPackageManager = getUserRepository();
     else if (repository.equals(OUSTR("shared")))
-        xPackageManager = m_sharedRepository;
+        xPackageManager = getSharedRepository();
     else if (repository.equals(OUSTR("bundled")))
-        xPackageManager = m_bundledRepository;
+        xPackageManager = getBundledRepository();
     else
         throw lang::IllegalArgumentException(
             OUSTR("No valid repository name provided."),
@@ -257,7 +270,7 @@ void ExtensionManager::addExtensionsToMap(
     ::std::list<Reference<deploy::XPackage> > extensionList;
     try
     {   //will throw an exception if the extension does not exist
-        extensionList.push_back(m_userRepository->getDeployedPackage(
+        extensionList.push_back(getUserRepository()->getDeployedPackage(
             identifier, fileName, Reference<ucb::XCommandEnvironment>()));
     } catch(lang::IllegalArgumentException &)
     {
@@ -265,7 +278,7 @@ void ExtensionManager::addExtensionsToMap(
     }
     try
     {
-        extensionList.push_back(m_sharedRepository->getDeployedPackage(
+        extensionList.push_back(getSharedRepository()->getDeployedPackage(
             identifier, fileName, Reference<ucb::XCommandEnvironment>()));
     } catch (lang::IllegalArgumentException &)
     {
@@ -273,7 +286,7 @@ void ExtensionManager::addExtensionsToMap(
     }
     try
     {
-       extensionList.push_back(m_bundledRepository->getDeployedPackage(
+       extensionList.push_back(getBundledRepository()->getDeployedPackage(
            identifier, fileName, Reference<ucb::XCommandEnvironment>()));
     } catch (lang::IllegalArgumentException &)
     {
@@ -477,7 +490,7 @@ Reference<deploy::XPackage> ExtensionManager::backupExtension(
 
     if (xOldExtension.is())
     {
-        xBackup = m_tmpRepository->addPackage(
+        xBackup = getTmpRepository()->addPackage(
             xOldExtension->getURL(), uno::Sequence<beans::NamedValue>(),
             OUString(), Reference<task::XAbortChannel>(), tmpCmdEnv);
 
@@ -498,7 +511,7 @@ uno::Sequence< Reference<deploy::XPackageTypeInfo> >
 ExtensionManager::getSupportedPackageTypes()
     throw (uno::RuntimeException)
 {
-    return m_userRepository->getSupportedPackageTypes();
+    return getUserRepository()->getSupportedPackageTypes();
 }
 
 // Only add to shared and user repository
@@ -517,9 +530,9 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
     //Determine the repository to use
     Reference<deploy::XPackageManager> xPackageManager;
     if (repository.equals(OUSTR("user")))
-        xPackageManager = m_userRepository;
+        xPackageManager = getUserRepository();
     else if (repository.equals(OUSTR("shared")))
-        xPackageManager = m_sharedRepository;
+        xPackageManager = getSharedRepository();
     else
         throw lang::IllegalArgumentException(
             OUSTR("No valid repository name provided."),
@@ -609,7 +622,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
                 //importing the old extension in the tmp repository will remove
                 //the xTmpExtension
                 xTmpExtension = 0;
-                xExtensionBackup = m_tmpRepository->importExtension(
+                xExtensionBackup = getTmpRepository()->importExtension(
                     xOldExtension, Reference<task::XAbortChannel>(),
                     tmpCmdEnv);
             }
@@ -668,7 +681,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
                 sIdentifier, sFileName, bUserDisabled, false,
                 Reference<task::XAbortChannel>(), tmpCmdEnv);
             if (xTmpExtension.is() || xExtensionBackup.is())
-                m_tmpRepository->removePackage(
+                getTmpRepository()->removePackage(
                     sIdentifier, OUString(), xAbortChannel, xCmdEnv);
             fireModified();
         }
@@ -678,7 +691,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
         ::cppu::throwException(excOccurred2);
     }
     if (xTmpExtension.is() || xExtensionBackup.is())
-        m_tmpRepository->removePackage(
+        getTmpRepository()->removePackage(
             sIdentifier,OUString(), xAbortChannel, xCmdEnv);
 
     if (excOccurred1.hasValue())
@@ -707,9 +720,9 @@ void ExtensionManager::removeExtension(
     {
 //Determine the repository to use
         if (repository.equals(OUSTR("user")))
-            xPackageManager = m_userRepository;
+            xPackageManager = getUserRepository();
         else if (repository.equals(OUSTR("shared")))
-            xPackageManager = m_sharedRepository;
+            xPackageManager = getSharedRepository();
         else
             throw lang::IllegalArgumentException(
                 OUSTR("No valid repository name provided."),
@@ -769,7 +782,7 @@ void ExtensionManager::removeExtension(
                     Reference<task::XAbortChannel>(),
                     tmpCmdEnv);
 
-                m_tmpRepository->removePackage(
+                getTmpRepository()->removePackage(
                     dp_misc::getIdentifier(xExtensionBackup),
                     xExtensionBackup->getName(), xAbortChannel, xCmdEnv);
                 fireModified();
@@ -782,7 +795,7 @@ void ExtensionManager::removeExtension(
     }
 
     if (xExtensionBackup.is())
-        m_tmpRepository->removePackage(
+        getTmpRepository()->removePackage(
             dp_misc::getIdentifier(xExtensionBackup),
             xExtensionBackup->getName(), xAbortChannel, xCmdEnv);
 }
@@ -1010,13 +1023,13 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > >
         id2extensions mapExt;
 
         uno::Sequence<Reference<deploy::XPackage> > userExt =
-            m_userRepository->getDeployedPackages(xAbort, xCmdEnv);
+            getUserRepository()->getDeployedPackages(xAbort, xCmdEnv);
         addExtensionsToMap(mapExt, userExt, OUSTR("user"));
         uno::Sequence<Reference<deploy::XPackage> > sharedExt =
-            m_sharedRepository->getDeployedPackages(xAbort, xCmdEnv);
+            getSharedRepository()->getDeployedPackages(xAbort, xCmdEnv);
         addExtensionsToMap(mapExt, sharedExt, OUSTR("shared"));
         uno::Sequence<Reference<deploy::XPackage> > bundledExt =
-            m_bundledRepository->getDeployedPackages(xAbort, xCmdEnv);
+            getBundledRepository()->getDeployedPackages(xAbort, xCmdEnv);
         addExtensionsToMap(mapExt, bundledExt, OUSTR("bundled"));
 
         //copy the values of the map to a vector for sorting
@@ -1110,6 +1123,53 @@ void ExtensionManager::reinstallDeployedExtensions(
     }
 }
 
+/** Works on the bundled repository. That is using the variables
+    BUNDLED_EXTENSIONS and BUNDLED_EXTENSIONS_USER.
+ */
+void ExtensionManager::synchronizeBundledPrereg(
+    Reference<task::XAbortChannel> const & xAbortChannel,
+    Reference<ucb::XCommandEnvironment> const & xCmdEnv )
+    throw (deploy::DeploymentException,
+           uno::RuntimeException)
+{
+    try
+    {
+        String sSynchronizingBundled(StrSyncRepository::get());
+        sSynchronizingBundled.SearchAndReplaceAllAscii( "%NAME", OUSTR("bundled"));
+        dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled);
+
+        Reference<deploy::XPackageManagerFactory> xPackageManagerFactory(
+            deploy::thePackageManagerFactory::get(m_xContext));
+
+        Reference<deploy::XPackageManager> xMgr =
+            xPackageManagerFactory->getPackageManager(OUSTR("bundled_prereg"));
+        xMgr->synchronize(xAbortChannel, xCmdEnv);
+        progressBundled.update(OUSTR("\n\n"));
+
+        uno::Sequence<Reference<deploy::XPackage> > extensions = xMgr->getDeployedPackages(
+            xAbortChannel, xCmdEnv);
+        for (sal_Int32 i = 0; i < extensions.getLength(); i++)
+        {
+            extensions[i]->registerPackage(true, xAbortChannel, xCmdEnv);
+        }
+    } catch (deploy::DeploymentException& ) {
+        throw;
+    } catch (ucb::CommandFailedException & ) {
+        throw;
+    } catch (ucb::CommandAbortedException & ) {
+        throw;
+    } catch (lang::IllegalArgumentException &) {
+        throw;
+    } catch (uno::RuntimeException &) {
+        throw;
+    } catch (...) {
+        uno::Any exc = ::cppu::getCaughtException();
+        throw deploy::DeploymentException(
+            OUSTR("Extension Manager: exception in synchronize"),
+            static_cast<OWeakObject*>(this), exc);
+    }
+}
+
 sal_Bool ExtensionManager::synchronize(
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
@@ -1127,13 +1187,13 @@ sal_Bool ExtensionManager::synchronize(
         String sSynchronizingShared(StrSyncRepository::get());
         sSynchronizingShared.SearchAndReplaceAllAscii( "%NAME", OUSTR("shared"));
         dp_misc::ProgressLevel progressShared(xCmdEnv, sSynchronizingShared);
-        bModified = m_sharedRepository->synchronize(xAbortChannel, xCmdEnv);
+        bModified = getSharedRepository()->synchronize(xAbortChannel, xCmdEnv);
         progressShared.update(OUSTR("\n\n"));
 
         String sSynchronizingBundled(StrSyncRepository::get());
         sSynchronizingBundled.SearchAndReplaceAllAscii( "%NAME", OUSTR("bundled"));
         dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled);
-        bModified |= m_bundledRepository->synchronize(xAbortChannel, xCmdEnv);
+        bModified |= getBundledRepository()->synchronize(xAbortChannel, xCmdEnv);
         progressBundled.update(OUSTR("\n\n"));
 
         //Always determine the active extension. This is necessary for the
@@ -1260,7 +1320,7 @@ Reference<deploy::XPackage> ExtensionManager::getTempExtension(
 
 {
     Reference<ucb::XCommandEnvironment> tmpCmdEnvA(new TmpRepositoryCommandEnv());
-    Reference<deploy::XPackage> xTmpPackage = m_tmpRepository->addPackage(
+    Reference<deploy::XPackage> xTmpPackage = getTmpRepository()->addPackage(
         url, uno::Sequence<beans::NamedValue>(),OUString(), xAbortChannel, tmpCmdEnvA);
     if (!xTmpPackage.is())
     {
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 64cada7da3ac..b3570e311828 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -205,6 +205,12 @@ public:
                css::lang::IllegalArgumentException,
                css::uno::RuntimeException);
 
+    virtual void SAL_CALL synchronizeBundledPrereg(
+        css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
+        throw (css::deployment::DeploymentException,
+               css::uno::RuntimeException);
+
     virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL
     getExtensionsWithUnacceptedLicenses(
         ::rtl::OUString const & repository,
@@ -229,11 +235,7 @@ private:
     };
 
     css::uno::Reference< css::uno::XComponentContext> m_xContext;
-
-    css::uno::Reference<css::deployment::XPackageManager> m_userRepository;
-    css::uno::Reference<css::deployment::XPackageManager> m_sharedRepository;
-    css::uno::Reference<css::deployment::XPackageManager> m_bundledRepository;
-    css::uno::Reference<css::deployment::XPackageManager> m_tmpRepository;
+    css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPackageManagerFactory;
 
     /* contains the names of all repositories (except tmp) in order of there
        priority. That is, the first element is "user" follod by "shared" and
@@ -241,6 +243,11 @@ private:
      */
     ::std::list< ::rtl::OUString > m_repositoryNames;
 
+    css::uno::Reference<css::deployment::XPackageManager> getUserRepository();
+    css::uno::Reference<css::deployment::XPackageManager> getSharedRepository();
+    css::uno::Reference<css::deployment::XPackageManager> getBundledRepository();
+    css::uno::Reference<css::deployment::XPackageManager> getTmpRepository();
+
     bool isUserDisabled(::rtl::OUString const & identifier,
                         ::rtl::OUString const & filename);
 
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 44bc4d469f2f..2e2c5e2a2f53 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -370,6 +370,24 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
         //No stamp file. We assume that bundled is always readonly. It must not be
         //modified from ExtensionManager but only by the installer
     }
+    else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled_prereg") )) {
+        //This is a bundled repository but the registration data
+        //is in the brand layer: share/prereg
+        //It is special because the registration data are copied at the first startup
+        //into the user installation. The processed help and xcu files are not
+        //copied. Instead the backenddb.xml for the help backend references the help
+        //by using $BUNDLED_EXTENSION_PREREG instead $BUNDLED_EXTENSIONS_USER. The
+        //configmgr.ini also used $BUNDLED_EXTENSIONS_PREREG to refer to the xcu file
+        //which contain the replacement for %origin%.
+        that->m_activePackages = OUSTR(
+            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS");
+        that->m_registrationData = OUSTR(
+            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG");
+        that->m_registryCache = OUSTR(
+            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/registry");
+        logFile = OUSTR(
+            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/log.txt");
+    }
     else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") )) {
         that->m_activePackages = OUSTR(
             "vnd.sun.star.expand:$TMP_EXTENSIONS/extensions");
@@ -949,6 +967,8 @@ void PackageManagerImpl::removePackage(
                 contentRemoved.writeStream( xData, true /* replace existing */ );
             }
             m_activePackagesDB->erase( id, fileName ); // to be removed upon next start
+            //remove any cached data hold by the backend
+            m_xRegistry->packageRemoved(xPackage->getURL(), xPackage->getPackageType()->getMediaType());
         }
         try_dispose( xPackage );
 
@@ -989,7 +1009,8 @@ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data )
     //The bundled extensions are not contained in an additional folder
     //with a unique name. data.temporaryName contains already the
     //UTF8 encoded folder name. See PackageManagerImpl::synchronize
-    if (!m_context.equals(OUSTR("bundled")))
+    if (!m_context.equals(OUSTR("bundled"))
+        && !m_context.equals(OUSTR("bundled_prereg")))
     {
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("_/") );
         buf.append( ::rtl::Uri::encode( data.fileName, rtl_UriCharClassPchar,
@@ -1341,6 +1362,8 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
     Reference<css::ucb::XCommandEnvironment> const & xCmdEnv)
 {
     bool bModified = false;
+    OSL_ASSERT(!m_context.equals(OUSTR("user")));
+
     ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() );
     //check if the folder exist at all. The shared extension folder
     //may not exist for a normal user.
@@ -1366,8 +1389,8 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
             //The temporary folders of user and shared have an '_' at then end.
             //But the name in ActivePackages.temporaryName is saved without.
             OUString title2 = title;
-            bool bNotBundled = !m_context.equals(OUSTR("bundled"));
-            if (bNotBundled)
+            bool bShared = m_context.equals(OUSTR("shared"));
+            if (bShared)
             {
                 OSL_ASSERT(title2[title2.getLength() -1] == '_');
                 title2 = title2.copy(0, title2.getLength() -1);
@@ -1389,7 +1412,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
                 // an added extension
                 OUString url(m_activePackages_expanded + OUSTR("/") + titleEncoded);
                 OUString sExtFolder;
-                if (bNotBundled) //that is, shared
+                if (bShared) //that is, shared
                 {
                     //Check if the extension was not "deleted" already which is indicated
                     //by a xxx.tmpremoved file
@@ -1411,7 +1434,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
                     ActivePackages::Data dbData;
 
                     dbData.temporaryName = titleEncoded;
-                    if (bNotBundled)
+                    if (bShared)
                         dbData.fileName = sExtFolder;
                     else
                         dbData.fileName = title;