Author: vmassol
Date: 2007-11-28 09:05:16 +0100 (Wed, 28 Nov 2007)
New Revision: 6105

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/AbstractXWikiMigrationManager.java
Log:
XWIKI-1900: Allow database migrations also for multiwikis

Should all work fine now. Doing more tests.

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/AbstractXWikiMigrationManager.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/AbstractXWikiMigrationManager.java
 2007-11-28 08:02:01 UTC (rev 6104)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/AbstractXWikiMigrationManager.java
 2007-11-28 08:05:16 UTC (rev 6105)
@@ -108,22 +108,6 @@
      */
     protected void setContextForDatabase(String databaseName, XWikiContext 
context) throws XWikiException
     {
-        // Get the document describing the virtual wiki
-        String serverwikipage = 
context.getWiki().getServerWikiPage(databaseName);
-        XWikiDocument doc = context.getWiki().getDocument(serverwikipage, 
context);
-        if (doc.isNew()) {
-            throw new XWikiException(XWikiException.MODULE_XWIKI,
-                XWikiException.ERROR_XWIKI_DOES_NOT_EXIST,
-                "The wiki [" + databaseName + "] does not exist");
-        }
-
-        // Set the wiki owner
-        String wikiOwner = doc.getStringValue("XWiki.XWikiServerClass", 
"owner");
-        if (wikiOwner.indexOf(":") == -1)
-            wikiOwner = context.getWiki().getDatabase() + ":" + wikiOwner;
-        context.setWikiOwner(wikiOwner);
-
-        context.setWikiServer(doc);
         context.setVirtual(true);
         context.setDatabase(databaseName);
         context.setOriginalDatabase(databaseName);

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to