Author: tchemit Date: 2010-11-23 08:55:53 +0100 (Tue, 23 Nov 2010) New Revision: 124 Url: http://chorem.org/repositories/revision/bow/124 Log: fix api changed from nuiton-utils + remove old license project descriptor Removed: trunk/src/license/project.xml Modified: trunk/src/main/java/org/chorem/bow/UserMigration.java Deleted: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml 2010-11-23 07:55:27 UTC (rev 123) +++ trunk/src/license/project.xml 2010-11-23 07:55:53 UTC (rev 124) @@ -1,21 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 ">http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-1.0.0.xsd"> - <mainLicense>agpl_v3</mainLicense> - <headers> - <header> - <licenseName>agpl_v3</licenseName> - <commentStyle>java</commentStyle> - <fileSets> - <fileSet> - <basedir>src/main/java</basedir> - <includes> - <include>main/java/**/*.java</include> - <include>test/java/**/*.java</include> - </includes> - </fileSet> - </fileSets> - </header> - </headers> -</project> Modified: trunk/src/main/java/org/chorem/bow/UserMigration.java =================================================================== --- trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-11-23 07:55:27 UTC (rev 123) +++ trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-11-23 07:55:53 UTC (rev 124) @@ -42,14 +42,19 @@ public class UserMigration implements WikittyExtensionMigration { @Override - public Wikitty migrate(WikittyService service, WikittyTransaction transaction, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { + public Wikitty migrate(WikittyService service, + WikittyTransaction transaction, + Wikitty wikitty, + WikittyExtension oldExt, + WikittyExtension newExt) { String id = wikitty.getId(); String version = wikitty.getVersion(); Wikitty newWikitty = new Wikitty(id); newWikitty.setVersion(version); - List<WikittyExtension> extensions = new ArrayList<WikittyExtension>(wikitty.getExtensions()); + List<WikittyExtension> extensions = + new ArrayList<WikittyExtension>(wikitty.getExtensions()); if (extensions.contains(oldExt)) { extensions.remove(oldExt); extensions.add(newExt); @@ -63,8 +68,8 @@ String password = (String) obj; try { password = StringUtil.encodeMD5(password); - } catch (NoSuchAlgorithmException ex) { - throw new WikittyException(ex); + } catch (RuntimeException ex) { + throw new WikittyException("Could not encore password", ex); } obj = password; }