[jboss-svn-commits] JBL Code SVN: r20785 - labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2008-06-26 03:01:50 -0400 (Thu, 26 Jun 2008)
New Revision: 20785

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/migration-howto.txt
Log:
howto updated, wrong pages handled

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java	2008-06-26 06:30:50 UTC (rev 20784)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java	2008-06-26 07:01:50 UTC (rev 20785)
@@ -12,6 +12,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -143,6 +144,8 @@
 
 	private void importAllPages(Set<String> toTransform) throws IOException {
 		// prepare dictionary
+		Set<String> removePages = new HashSet<String>();
+		
 		for (String pageName : toTransform) {
 			try {
 				Document wsd = documentManager.createDocument(adminUser,
@@ -182,8 +185,16 @@
 			} catch (RejectedException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
+			} catch (NullPointerException e) {
+				// ignore - page coudln't be open
+				log.write("Page couldn't be open: "+pageName+"\n");
+				log.write(e.toString());
+				removePages.add(pageName);
 			}
 		}
+
+		// remove wrong pages
+		toTransform.removeAll(removePages);
 	}
 	
 	private void importAttachments(Set<String> toTransform)

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/migration-howto.txt
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/migration-howto.txt	2008-06-26 06:30:50 UTC (rev 20784)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/migration-howto.txt	2008-06-26 07:01:50 UTC (rev 20785)
@@ -1,5 +1,13 @@
 Clearspace Migration HOWTO
 
+INSTALLATION
+0. Install CS
+1. Build and install nukes login from labs-3.0-build/integration
+2. Build JBossWiki with maven all
+3. Point your cs installation in jbosswiki/wiki-common/build.xml
+4. Run ant in jbosswiki/wiki-common
+
+RUNING
 1. Install clearspace
 2. create db with default charset utf default collate utf8_general_ci (//TODO)
 3. setup cs with db created