diff --git a/confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java b/confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java index 693ceac..f306a59 100644 --- a/confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java +++ b/confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java @@ -360,7 +360,18 @@ public class ConfluenceInputFilterStream if (pageProperties.containsKey(ConfluenceXMLPackage.KEY_PAGE_CREATION_AUTHOR)) { documentLocaleParameters.put(WikiDocumentFilter.PARAMETER_CREATION_AUTHOR, pageProperties.getString(ConfluenceXMLPackage.KEY_PAGE_CREATION_AUTHOR)); + } else if (pageProperties.containsKey(ConfluenceXMLPackage.KEY_PAGE_CREATION_AUTHOR_KEY)) { + String authorKey = pageProperties.getString(ConfluenceXMLPackage.KEY_PAGE_CREATION_AUTHOR_KEY); + System.out.println("In author key: " + authorKey); + try { + String authorName = this.confluencePackage.getUserProperties(authorKey) + .getString(ConfluenceXMLPackage.KEY_USER_NAME, String.valueOf(authorKey)); + System.out.println("Found author name: " + authorName); + documentLocaleParameters.put(WikiDocumentFilter.PARAMETER_CREATION_AUTHOR, authorName); + } catch (ConfigurationException e) { + } } + if (pageProperties.containsKey(ConfluenceXMLPackage.KEY_PAGE_CREATION_DATE)) { try { documentLocaleParameters.put(WikiDocumentFilter.PARAMETER_CREATION_DATE, @@ -438,6 +449,15 @@ public class ConfluenceInputFilterStream if (pageProperties.containsKey(ConfluenceXMLPackage.KEY_PAGE_REVISION_AUTHOR)) { documentRevisionParameters.put(WikiDocumentFilter.PARAMETER_REVISION_AUTHOR, pageProperties.getString(ConfluenceXMLPackage.KEY_PAGE_REVISION_AUTHOR)); + } else if (pageProperties.containsKey(ConfluenceXMLPackage.KEY_PAGE_REVISION_AUTHOR_KEY)) { + String authorKey = pageProperties.getString(ConfluenceXMLPackage.KEY_PAGE_REVISION_AUTHOR_KEY); + try { + String authorName = this.confluencePackage.getUserProperties(authorKey) + .getString(ConfluenceXMLPackage.KEY_USER_NAME, String.valueOf(authorKey)); + documentRevisionParameters.put(WikiDocumentFilter.PARAMETER_REVISION_AUTHOR, authorName); + } catch (ConfigurationException e) { + } + } if (pageProperties.containsKey(ConfluenceXMLPackage.KEY_PAGE_REVISION_DATE)) { try {