[jboss-svn-commits] JBL Code SVN: r20790 - labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 26 04:19:27 EDT 2008
Author: szimano
Date: 2008-06-26 04:19:27 -0400 (Thu, 26 Jun 2008)
New Revision: 20790
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java
Log:
NPE dealing when importing
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 08:16:02 UTC (rev 20789)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java 2008-06-26 08:19:27 UTC (rev 20790)
@@ -187,7 +187,7 @@
e.printStackTrace();
} catch (NullPointerException e) {
// ignore - page coudln't be open
- log.write("Page couldn't be open: "+pageName+"\n");
+ log.write("Page couldn't be open: " + pageName + "\n");
log.write(e.toString());
removePages.add(pageName);
}
@@ -197,29 +197,29 @@
toTransform.removeAll(removePages);
log.write("\nAll pages import END\n");
}
-
+
private void importAttachments(Set<String> toTransform)
throws DocumentObjectNotFoundException, UnauthorizedException,
IOException {
log.write("\nAttachment import START\n");
for (String pageName : toTransform) {
- WikiPage page = we.getByName(pageName, null,
- ConfigurationParser.getDefaultLangugeCode());
+ WikiPage page = we.getByName(pageName, null, ConfigurationParser
+ .getDefaultLangugeCode());
Document original = documentManager.getDocument(pageDictionary
.get(pageName));
// add attachments
- Set<String> atts = we.getAttachmentsSet(page,
- ConfigurationParser.getDefaultLangugeCode());
+ Set<String> atts = we.getAttachmentsSet(page, ConfigurationParser
+ .getDefaultLangugeCode());
if (atts != null)
for (String att : atts) {
try {
- WikiAttachment wa = we.getAttachment(
- page.getName(), att, ConfigurationParser
+ WikiAttachment wa = we.getAttachment(page.getName(),
+ att, ConfigurationParser
.getDefaultLangugeCode());
attachmentManager.createAttachment(original, att,
@@ -227,105 +227,115 @@
.getInputStream(), null);
wa.getInputStream().close();
-
+
original.save();
- System.out.println("Attachment " + att
- + " added for " + page.getName());
+ System.out.println("Attachment " + att + " added for "
+ + page.getName());
} catch (AttachmentException e) {
- System.err
- .println("Problem with adding attachment "
- + att + " for page " + pageName);
- log.write("Problem with adding attachment "
- + att + " for page " + pageName+"\n");
+ System.err.println("Problem with adding attachment "
+ + att + " for page " + pageName);
+ log.write("Problem with adding attachment " + att
+ + " for page " + pageName + "\n");
e.printStackTrace();
+ } catch (NullPointerException e) {
+ // ignore - page coudln't be open
+ log.write("Problem with adding attachment " + att
+ + " for page " + pageName + "\n");
+ log.write(e.toString());
}
}
}
log.write("\nAttachment import END\n");
}
- private void importVersions(Set<String> toTransform)
- throws Exception {
+ private void importVersions(Set<String> toTransform) throws Exception {
// Connection c = getCSConnection();
log.write("\nVersion import START\n");
try {
for (String pageName : toTransform) {
+ try {
+ WikiPage page = we.getByName(pageName, null,
+ ConfigurationParser.getDefaultLangugeCode());
- WikiPage page = we.getByName(pageName, null,
- ConfigurationParser.getDefaultLangugeCode());
+ Document original = documentManager
+ .getDocument(pageDictionary.get(pageName));
- Document original = documentManager.getDocument(pageDictionary
- .get(pageName));
+ // add versions
+ for (int ver = 1; ver <= page.getLastVersion(); ver++) {
+ WikiPage pageVer = we.getByName(pageName, null, ver,
+ ConfigurationParser.getDefaultLangugeCode());
- // add versions
- for (int ver = 1; ver <= page.getLastVersion(); ver++) {
- WikiPage pageVer = we.getByName(pageName, null, ver,
- ConfigurationParser.getDefaultLangugeCode());
+ String content = translator.parse(pageName, pageVer
+ .getContent(), pageDictionary,
+ pageDictionaryRev, log);
- String content = translator.parse(pageName, pageVer.getContent(),
- pageDictionary, pageDictionaryRev, log);
+ org.w3c.dom.Document body = WikiContentHelper
+ .wikiToJiveDocument(content);
- org.w3c.dom.Document body = WikiContentHelper
- .wikiToJiveDocument(content);
+ original.setBody(body);
+ original.setCreationDate(pageVer.getEditDate());
+ original.setModificationDate(pageVer.getEditDate());
- original.setBody(body);
- original.setCreationDate(pageVer.getEditDate());
- original.setModificationDate(pageVer.getEditDate());
+ User user = getUser(pageVer.getLastAuthor().getName());
- User user = getUser(pageVer.getLastAuthor().getName());
+ if (user == null) {
+ System.err.println("User "
+ + pageVer.getLastAuthor().getName()
+ + " null !");
+ user = unknownUser;
+ }
- if (user == null) {
- System.err
- .println("User "
- + pageVer.getLastAuthor().getName()
- + " null !");
- user = unknownUser;
- }
+ original.setUser(user);
- original.setUser(user);
+ // original.addAuthor(user);
+ original.setMinorEdit(true);
- // original.addAuthor(user);
- original.setMinorEdit(true);
-
- original.save();
+ original.save();
- long creation = pageVer.getEditDate().getTime();
+ long creation = pageVer.getEditDate().getTime();
- // update user and last modification date
+ // update user and last modification date
- String sql = "UPDATE jiveDocVersion j SET modificationDate='"
- + creation
- + "', userID='"
- + user.getID()
- + "' WHERE j.internalDocID='"
- + original.getID()
- + "' and j.versionID='" + (ver + 1) + "';";
- // System.out.println("SQL: " + sql);
+ String sql = "UPDATE jiveDocVersion j SET modificationDate='"
+ + creation
+ + "', userID='"
+ + user.getID()
+ + "' WHERE j.internalDocID='"
+ + original.getID()
+ + "' and j.versionID='"
+ + (ver + 1) + "';";
+ // System.out.println("SQL: " + sql);
- if (ver == 1) {
- // update also frist version by clearspace
- sqlScript
- .write("UPDATE jiveDocVersion j SET modificationDate='"
- + creation
- + "', userID='"
- + user.getID()
- + "' WHERE j.internalDocID='"
- + original.getID()
- + "' and j.versionID='"
- + (ver)
- + "';\n");
- }
+ if (ver == 1) {
+ // update also frist version by clearspace
+ sqlScript
+ .write("UPDATE jiveDocVersion j SET modificationDate='"
+ + creation
+ + "', userID='"
+ + user.getID()
+ + "' WHERE j.internalDocID='"
+ + original.getID()
+ + "' and j.versionID='"
+ + (ver)
+ + "';\n");
+ }
- sqlScript.write(sql + "\n");
+ sqlScript.write(sql + "\n");
- // c.createStatement().execute(sql);
+ // c.createStatement().execute(sql);
- original = documentManager.getDocument(original
- .getDocumentID());
+ original = documentManager.getDocument(original
+ .getDocumentID());
- System.out.println("Version " + ver + " updated for "
- + pageVer.getName());
+ System.out.println("Version " + ver + " updated for "
+ + pageVer.getName());
+ }
+ } catch (NullPointerException e) {
+ // ignore - page coudln't be open
+ log.write("Problem with migrating versions for page "
+ + pageName + "\n");
+ log.write(e.toString());
}
}
} catch (IOException e) {
@@ -367,7 +377,7 @@
}
importAllPages(toTransform);
-
+
importAttachments(toTransform);
importVersions(toTransform);
More information about the jboss-svn-commits
mailing list