[jboss-svn-commits] JBL Code SVN: r21729 - 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
Fri Aug 22 10:24:01 EDT 2008
Author: szimano
Date: 2008-08-22 10:24:01 -0400 (Fri, 22 Aug 2008)
New Revision: 21729
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java
Log:
wiki common
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-08-22 14:23:53 UTC (rev 21728)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java 2008-08-22 14:24:01 UTC (rev 21729)
@@ -51,6 +51,7 @@
import com.jivesoftware.community.DuplicateIDException;
import com.jivesoftware.community.JiveIterator;
import com.jivesoftware.community.RejectedException;
+import com.jivesoftware.community.renderer.impl.v2.JAXPUtils;
import com.jivesoftware.community.util.WikiUtils;
public class CSMigration {
@@ -83,6 +84,7 @@
private JSP2CSMarkupTranslator translator = new JSP2CSMarkupTranslator();
private FileWriter sqlScript;
private FileWriter log;
+ private String pagesToTranslateRegexp;
public CSMigration() {
@@ -287,9 +289,14 @@
// add versions
for (int ver = 1; ver <= page.getLastVersion(); ver++) {
+ Date startWhole = new Date();
+
WikiPage pageVer = we.getByName(pageName, null, ver,
ConfigurationParser.getDefaultLangugeCode());
+ double wikiGetTime = ((double) (new Date().getTime() - startWhole
+ .getTime()) / 1000);
+
Date start = new Date();
String content = translator.parse(pageName, pageVer
@@ -307,12 +314,39 @@
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);
+ start = new Date();
+
original.setBody(body);
+
+ 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);
+ start = new Date();
+
original.setModificationDate(pageVer.getEditDate());
+ 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);
+ start = new Date();
+
if (user == null) {
System.err.println("User "
+ pageVer.getLastAuthor().getName()
@@ -322,16 +356,20 @@
original.setUser(user);
+ double setUser = ((double) (new Date()
+ .getTime() - start.getTime()) / 1000);
+ start = new Date();
+
// original.addAuthor(user);
original.setMinorEdit(true);
+ double docSetTime = ((double) (new Date().getTime() - startDocSet
+ .getTime()) / 1000);
+
start = new Date();
original.save();
- double savingTime = ((double) (new Date().getTime() - start
- .getTime()) / 1000);
-
long creation = pageVer.getEditDate().getTime();
// update user and last modification date
@@ -363,6 +401,9 @@
sqlScript.write(sql + "\n");
+ double savingTime = ((double) (new Date().getTime() - start
+ .getTime()) / 1000);
+
// c.createStatement().execute(sql);
start = new Date();
@@ -381,6 +422,9 @@
+ "\n=========================================\n\n");
}
+ double wholeTime = ((double) (new Date().getTime() - startWhole
+ .getTime()) / 1000);
+
System.out
.println("Version "
+ ver
@@ -388,10 +432,9 @@
+ pageVer.getName()
+ String
.format(
- " jsp parsing took %.4f seconds; jive parsing took %.4f seconds saving took %.4f seconds getting back took %.4f seconds",
- parsingTime,
- innerParsingTime,
- savingTime, gettingTime));
+ "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));
}
} catch (NullPointerException e) {
// ignore - page coudln't be open
@@ -441,7 +484,7 @@
log = new FileWriter(new File("log-" + sdf.format(start) + ".txt"));
for (String pageName : pages) {
- if (pageName.matches("[C].*")) {
+ if (pageName.matches(pagesToTranslateRegexp)) {
toTransform.add(pageName);
}
}
@@ -644,4 +687,12 @@
public void setDbNukesUrl(String dbNukesUrl) {
this.dbNukesUrl = dbNukesUrl;
}
+
+ public String getPagesToTranslateRegexp() {
+ return pagesToTranslateRegexp;
+ }
+
+ public void setPagesToTranslateRegexp(String pagesToTranslateRegexp) {
+ this.pagesToTranslateRegexp = pagesToTranslateRegexp;
+ }
}
More information about the jboss-svn-commits
mailing list