Author: athimel Date: 2013-07-19 15:34:57 +0200 (Fri, 19 Jul 2013) New Revision: 2771 Url: http://nuiton.org/projects/topia/repository/revisions/2771 Log: fixes #2501 Remove any sun.misc.* usage Modified: trunk/pom.xml trunk/topia-service-security/pom.xml trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-14 20:13:25 UTC (rev 2770) +++ trunk/pom.xml 2013-07-19 13:34:57 UTC (rev 2771) @@ -157,6 +157,12 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.8</version> + </dependency> + <!-- hibernate-core only include api, need implementation, binding with log4j will be used --> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2013-07-14 20:13:25 UTC (rev 2770) +++ trunk/topia-service-security/pom.xml 2013-07-19 13:34:57 UTC (rev 2771) @@ -63,6 +63,11 @@ </dependency> <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java 2013-07-14 20:13:25 UTC (rev 2770) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java 2013-07-19 13:34:57 UTC (rev 2771) @@ -37,6 +37,7 @@ package org.nuiton.topia.security.util; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -52,7 +53,6 @@ import org.nuiton.topia.security.entities.user.TopiaUser; import org.nuiton.topia.security.entities.user.TopiaUserImpl; import org.nuiton.topia.security.jaas.TopiaLoginModule; -import sun.misc.BASE64Encoder; import javax.security.auth.Subject; import java.security.AccessController; @@ -119,8 +119,7 @@ MessageDigest digest = MessageDigest.getInstance("SHA"); byte[] bytes = msg.getBytes(); bytes = digest.digest(bytes); - BASE64Encoder encoder = new sun.misc.BASE64Encoder(); - String msgHashed = encoder.encode(bytes); + String msgHashed = Base64.encodeBase64String(bytes); return msgHashed; } catch (NoSuchAlgorithmException nsee) { return msg; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2013-07-14 20:13:25 UTC (rev 2770) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2013-07-19 13:34:57 UTC (rev 2771) @@ -46,6 +46,7 @@ import javax.security.auth.Subject; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -95,8 +96,7 @@ MessageDigest digest = MessageDigest.getInstance("SHA"); byte[] bytes = msg.getBytes(); bytes = digest.digest(bytes); - sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder(); - String msgHashed = encoder.encode(bytes); + String msgHashed = Base64.encodeBase64String(bytes); return msgHashed; } catch (NoSuchAlgorithmException nsee) { return msg;