From the MoinMoin user files, parse the "original name" (moin username) from
the name field, and the "userid to convert to" (confluence username) from
the aliasname field. This way, the Moin user files don't have to be edited
by hand / script, but can be used as is, and Moin users can fill in their
own confluence-userid-to-convert-to in the Alias-Name in their Moin settings.
diff --git a/src/main/java/com/atlassian/uwc/converters/moinmoin/MoinUserLinkConverter.java b/src/main/java/com/atlassian/uwc/converters/moinmoin/MoinUserLinkConverter.java
index 392416a..5adc8fd 100644
--- a/src/main/java/com/atlassian/uwc/converters/moinmoin/MoinUserLinkConverter.java
+++ b/src/main/java/com/atlassian/uwc/converters/moinmoin/MoinUserLinkConverter.java
@@ -67,8 +67,8 @@
private Map<String, String> getOrigNameToUserIdMapping(String userFileDir) {
Map<String, String> res = new HashMap<String, String>();
- Pattern origNameFinder = Pattern.compile("^origname=(\\S+)", Pattern.MULTILINE);
- Pattern userIdFinder = Pattern.compile("^name=(\\S+)", Pattern.MULTILINE);
+ Pattern origNameFinder = Pattern.compile("^name=(\\S+)", Pattern.MULTILINE);
+ Pattern userIdFinder = Pattern.compile("^aliasname=(\\S+)", Pattern.MULTILINE);
try{
File userdir = new File(userFileDir);
diff --git a/src/main/java/com/atlassian/uwc/exporters/MoinmoinExporter.java b/src/main/java/com/atlassian/uwc/exporters/MoinmoinExporter.java
index 5b5abef..0ad5ea1 100644
--- a/src/main/java/com/atlassian/uwc/exporters/MoinmoinExporter.java
+++ b/src/main/java/com/atlassian/uwc/exporters/MoinmoinExporter.java
@@ -196,7 +196,7 @@
String usersrc = srcDir + File.separator + "user";
log.debug("read UserInfo: " + usersrc);
- Pattern namefinder = Pattern.compile("^name=(\\S+)", Pattern.MULTILINE);
+ Pattern namefinder = Pattern.compile("^aliasname=(\\S+)", Pattern.MULTILINE);
try{
File userdir = new File(usersrc);
@@ -230,7 +230,7 @@
String usersrc = srcDir + File.separator + "user";
log.debug("read OrigNameInfo: " + usersrc);
- Pattern origNameFinder = Pattern.compile("^origname=(\\S+)", Pattern.MULTILINE);
+ Pattern origNameFinder = Pattern.compile("^name=(\\S+)", Pattern.MULTILINE);
try{
File userdir = new File(usersrc);
