[jboss-svn-commits] JBL Code SVN: r23107 - 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-09-26 07:06:26 -0400 (Fri, 26 Sep 2008)
New Revision: 23107

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java
Log:
excveption handle

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-09-26 11:05:47 UTC (rev 23106)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java	2008-09-26 11:06:26 UTC (rev 23107)
@@ -78,14 +78,14 @@
 
 	private final static Map parameters = new HashMap();
 	private User adminUser;
-	//private JSP2CSMarkupTranslator translator = new JSP2CSMarkupTranslator();
+	// private JSP2CSMarkupTranslator translator = new JSP2CSMarkupTranslator();
 	private JSP2CSMarkupWikiTranslator translator = new JSP2CSMarkupWikiTranslator();
 	private FileWriter sqlScript;
 	private FileWriter log;
 	private String pagesToTranslateRegexp;
 
 	private UserImporter userImporter;
-	
+
 	public CSMigration() {
 
 	}
@@ -162,7 +162,7 @@
 						.wikiToJiveDocument(content);
 
 				wsd.setBody(body);
-				
+
 				wsd.setUser(getUser(page.getLastAuthor().getName()));
 
 				wsd.setDocumentState(DocumentState.PUBLISHED);
@@ -304,8 +304,8 @@
 						String content = translator.parse(pageName, pageVer
 								.getContent(), pageDictionary,
 								pageDictionaryRev, log);
-						
-						//TODO show content
+
+						// TODO show content
 						if (page.getVersion() == page.getLastVersion())
 							System.out.println(content);
 
@@ -314,45 +314,48 @@
 
 						start = new Date();
 
-						//org.w3c.dom.Document body = WikiContentHelper.editorHtmlToJiveDocument(content, original);
-						org.w3c.dom.Document body = WikiContentHelper.wikiToJiveDocument(content);
-						
+						// org.w3c.dom.Document body =
+						// WikiContentHelper.editorHtmlToJiveDocument(content,
+						// original);
+						org.w3c.dom.Document body = WikiContentHelper
+								.wikiToJiveDocument(content);
+
 						double innerParsingTime = ((double) (new Date()
 								.getTime() - start.getTime()) / 1000);
 
 						Date startDocSet = new Date();
 						start = new Date();
-						
+
 						JAXPUtils.toXmlString(body);
-						
-						double convertXml = ((double) (new Date()
-						.getTime() - start.getTime()) / 1000);
+
+						double convertXml = ((double) (new Date().getTime() - start
+								.getTime()) / 1000);
 						start = new Date();
-						
+
 						original.setBody(body);
-						
-						double setBody = ((double) (new Date()
-						.getTime() - start.getTime()) / 1000);
+
+						double setBody = ((double) (new Date().getTime() - start
+								.getTime()) / 1000);
 						start = new Date();
-						
+
 						original.setCreationDate(pageVer.getEditDate());
-						
-						double setDate = ((double) (new Date()
-						.getTime() - start.getTime()) / 1000);
+
+						double setDate = ((double) (new Date().getTime() - start
+								.getTime()) / 1000);
 						start = new Date();
-						
+
 						original.setModificationDate(pageVer.getEditDate());
 
-						double setModDate = ((double) (new Date()
-						.getTime() - start.getTime()) / 1000);
+						double setModDate = ((double) (new Date().getTime() - start
+								.getTime()) / 1000);
 						start = new Date();
-						
+
 						User user = getUser(pageVer.getLastAuthor().getName());
 
-						double getUser = ((double) (new Date()
-						.getTime() - start.getTime()) / 1000);
+						double getUser = ((double) (new Date().getTime() - start
+								.getTime()) / 1000);
 						start = new Date();
-						
+
 						if (user == null) {
 							System.err.println("User "
 									+ pageVer.getLastAuthor().getName()
@@ -362,10 +365,10 @@
 
 						original.setUser(user);
 
-						double setUser = ((double) (new Date()
-						.getTime() - start.getTime()) / 1000);
+						double setUser = ((double) (new Date().getTime() - start
+								.getTime()) / 1000);
 						start = new Date();
-						
+
 						// original.addAuthor(user);
 						original.setMinorEdit(true);
 
@@ -439,8 +442,11 @@
 										+ String
 												.format(
 														"jive parsing took %.4f setBody %.4f setDate %.4f setModeDate %.4f getUser %.4f setUser %.4f docset %.4f convertxml %.4f",
-														innerParsingTime, setBody, setDate, setModDate, getUser, setUser,
-														docSetTime, convertXml));
+														innerParsingTime,
+														setBody, setDate,
+														setModDate, getUser,
+														setUser, docSetTime,
+														convertXml));
 					}
 				} catch (NullPointerException e) {
 					// ignore - page coudln't be open
@@ -508,7 +514,10 @@
 			System.out
 					.println("Migration DONE ! Please stop clearspace and run script "
 							+ fSqlScript.getAbsolutePath());
+		} catch (Exception e) {
+			e.printStackTrace();
 		} finally {
+
 			sqlScript.close();
 			log.close();
 		}
@@ -574,13 +583,13 @@
 		}
 
 		User user;
-		
+
 		try {
 			user = userImporter.getUser(userName, true);
 		} catch (Exception e) {
 			return unknownUser;
 		}
-		
+
 		users.put(userName, user);
 
 		return user;