[jboss-svn-commits] JBL Code SVN: r20763 - labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 25 08:46:22 EDT 2008
Author: szimano
Date: 2008-06-25 08:46:22 -0400 (Wed, 25 Jun 2008)
New Revision: 20763
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/CSMigration.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/JSP2CSMarkupTranslator.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/migration-howto.txt
Log:
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/CSMigration.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/CSMigration.java 2008-06-25 12:44:04 UTC (rev 20762)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/CSMigration.java 2008-06-25 12:46:22 UTC (rev 20763)
@@ -153,7 +153,7 @@
ConfigurationParser.getDefaultLangugeCode());
String content = translator.parse(page.getContent(),
- pageDictionary, pageDictionaryRev);
+ pageDictionary, pageDictionaryRev, log);
org.w3c.dom.Document body = WikiContentHelper
.wikiToJiveDocument(content);
@@ -234,7 +234,7 @@
ConfigurationParser.getDefaultLangugeCode());
String content = translator.parse(pageVer.getContent(),
- pageDictionary, pageDictionaryRev);
+ pageDictionary, pageDictionaryRev, log);
org.w3c.dom.Document body = WikiContentHelper
.wikiToJiveDocument(content);
@@ -264,6 +264,17 @@
+ "' 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");
+ }
+
sqlScript.write(sql + "\n");
// c.createStatement().execute(sql);
@@ -301,12 +312,12 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-HH-mm");
- File fSqlScript = new File("versions_and_users-" + sdf.format(start)
- + ".sql");
+ File fSqlScript = new File("versions_and_users-"
+ + sdf.format(start) + ".sql");
sqlScript = new FileWriter(fSqlScript);
- log = new FileWriter(new File("log-" + sdf.format(start) + ".sql"));
+ log = new FileWriter(new File("log-" + sdf.format(start) + ".txt"));
for (String pageName : pages) {
if (pageName.matches("[JT].*")) {
toTransform.add(pageName);
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/JSP2CSMarkupTranslator.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/JSP2CSMarkupTranslator.java 2008-06-25 12:44:04 UTC (rev 20762)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/JSP2CSMarkupTranslator.java 2008-06-25 12:46:22 UTC (rev 20763)
@@ -116,6 +116,8 @@
private Map<String, String> linkDict;
+ private FileWriter logFile;
+
public JSP2CSMarkupTranslator() {
}
@@ -274,9 +276,9 @@
*/
break;
- case '\\':
+ /*case '\\':
s = handleBackslash();
- break;
+ break;*/
case '_':
s = handleUnderscore();
@@ -820,7 +822,11 @@
if (isPluginLink(link)) {
// return null; // we do not include plugin links for now
// TODO make those CS macros
-
+ try {
+ logFile.write("Unknown inside plugin: "+link+"\n");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
return link;
}
int border = link.indexOf('|');
@@ -874,7 +880,7 @@
result = "!" + link + "!";
}
- // check for attachments later on //TODO hanle attachments
+ // check for attachments later on //TODO handle attachments
else {
/*
@@ -1029,10 +1035,11 @@
}
public String parse(String pageContent, Map<String, String> linkDict,
- Map<String, String> linkDictRev) throws IOException {
+ Map<String, String> linkDictRev, FileWriter logFile) throws IOException {
this.linkDict = linkDict;
this.linkDictRev = linkDictRev;
+ this.logFile = logFile;
initTranslator();
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/migration-howto.txt
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/migration-howto.txt 2008-06-25 12:44:04 UTC (rev 20762)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/labs/clearspace/migration-howto.txt 2008-06-25 12:46:22 UTC (rev 20763)
@@ -3,9 +3,10 @@
1. Install clearspace
2. create db with default charset utf default collate utf8_general_ci (//TODO)
3. setup cs with db created
-4. run sql-script.txt (change db name if needed)
+4. Change number of max attachments in clearspace settings (from 5 to something reasonable)
+5. run sql-script.txt (change db name if needed)
ALTER TABLE `cs`.`jiveWikiLink` MODIFY COLUMN `targetText` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL;
-5. set envirnment MIGRATE to true export MIGRATE=true
-6. run clearspace, login -> migration will start
-7. Stop clearspace, run generated sql script in mysql (see clearspace log) versions_and_users-${DATE}.sql
-8. remove MIGRATE env from environment. start clearspace. check the migration
+6. set envirnment MIGRATE to true export MIGRATE=true
+7. run clearspace, login -> migration will start
+8. Stop clearspace, run generated sql script in mysql (see clearspace log) versions_and_users-${DATE}.sql
+9. remove MIGRATE env from environment. start clearspace. check the migration
More information about the jboss-svn-commits
mailing list