Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -ra4fd7ba340a2beac7436660039f13b9c8708f172 -r3e90dd984595eb1678e0768267949614f2e670a6 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision a4fd7ba340a2beac7436660039f13b9c8708f172) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 3e90dd984595eb1678e0768267949614f2e670a6) @@ -1042,7 +1042,7 @@ } /** - * Looks for [login].png images in /tmp/portraits of user IDs within given range and starting with the given prefix + * Looks for [login].jpg images in /tmp/portraits of user IDs within given range and starting with the given prefix */ @Override public List uploadPortraits(Integer minUserId, Integer maxUserId, String prefix) throws IOException { @@ -1075,7 +1075,7 @@ } login = login.substring(prefixLength); } - File portraitFile = new File(tmpDir, login + ".png"); + File portraitFile = new File(tmpDir, login + ".jpg"); if (!portraitFile.canRead()) { if (log.isDebugEnabled()) { log.debug("Portrait for user " + userId + " with login \"" + login @@ -1088,7 +1088,7 @@ FileInputStream is = new FileInputStream(portraitFile); String fileNameWithoutExt = login; NodeKey originalFileNode = centralToolContentHandler.uploadFile(is, - fileNameWithoutExt + "_original.png", "image/png"); + fileNameWithoutExt + "_original.jpg", "image/jpeg"); is.close(); log.debug("Saved original portrait with uuid: " + originalFileNode.getUuid() + " and version: " + originalFileNode.getVersion()); @@ -1098,7 +1098,7 @@ InputStream modifiedPortraitInputStream = ResizePictureUtil.resize(is, PORTRAIT_LARGEST_DIMENSION_LARGE); NodeKey node = centralToolContentHandler.updateFile(originalFileNode.getUuid(), - modifiedPortraitInputStream, fileNameWithoutExt + "_large.png", "image/png"); + modifiedPortraitInputStream, fileNameWithoutExt + "_large.jpg", "image/jpeg"); modifiedPortraitInputStream.close(); is.close(); if (log.isDebugEnabled()) { @@ -1110,7 +1110,7 @@ is = new FileInputStream(portraitFile); modifiedPortraitInputStream = ResizePictureUtil.resize(is, PORTRAIT_LARGEST_DIMENSION_MEDIUM); node = centralToolContentHandler.updateFile(node.getUuid(), modifiedPortraitInputStream, - fileNameWithoutExt + "_medium.png", "image/png"); + fileNameWithoutExt + "_medium.jpg", "image/jpeg"); modifiedPortraitInputStream.close(); is.close(); if (log.isDebugEnabled()) { @@ -1122,7 +1122,7 @@ is = new FileInputStream(portraitFile); modifiedPortraitInputStream = ResizePictureUtil.resize(is, PORTRAIT_LARGEST_DIMENSION_SMALL); node = centralToolContentHandler.updateFile(node.getUuid(), modifiedPortraitInputStream, - fileNameWithoutExt + "_small.png", "image/png"); + fileNameWithoutExt + "_small.jpg", "image/jpeg"); modifiedPortraitInputStream.close(); is.close(); if (log.isDebugEnabled()) { @@ -1197,4 +1197,4 @@ public void setCentralToolContentHandler(IToolContentHandler centralToolContentHandler) { this.centralToolContentHandler = centralToolContentHandler; } -} \ No newline at end of file +}