Author: vmassol
Date: 2007-11-28 11:00:38 +0100 (Wed, 28 Nov 2007)
New Revision: 6107
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
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
* Do not fail the full migration if one virtual wiki failed to be migrated
XWIKI-1902: Add new privileged API to list all virtual wikis
* Exclude XWikiServerClassTemplate from the HQL search for virtual wikis
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
2007-11-28 08:06:22 UTC (rev 6106)
+++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
2007-11-28 10:00:38 UTC (rev 6107)
@@ -404,7 +404,8 @@
{
List databaseNames = new ArrayList();
String hql = ", BaseObject as obj, StringProperty as prop where
obj.name=doc.fullName"
- + " and obj.className='XWiki.XWikiServerClass' and prop.id.id =
obj.id ";
+ + " and obj.name <> 'XWiki.XWikiServerClassTemplate' and
obj.className='XWiki.XWikiServerClass' "
+ + "and prop.id.id = obj.id ";
List list = getStore().searchDocumentsNames(hql, context);
for (Iterator it = list.iterator(); it.hasNext();) {
String docname = (String) it.next();
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:06:22 UTC (rev 6106)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/AbstractXWikiMigrationManager.java
2007-11-28 10:00:38 UTC (rev 6107)
@@ -86,7 +86,11 @@
context.setVirtual(true);
context.setDatabase(database);
context.setOriginalDatabase(database);
- startMigrationsForDatabase(context);
+ try {
+ startMigrationsForDatabase(context);
+ } catch (XWikiException e) {
+ LOG.info("Failed to migrate database [" + database +
"]...", e);
+ }
}
} finally {
context.setVirtual(currentIsVirtual);
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
