You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2009/06/22 21:58:58 UTC
svn commit: r787371 -
/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java
Author: rwatler
Date: Mon Jun 22 19:58:57 2009
New Revision: 787371
URL: http://svn.apache.org/viewvc?rev=787371&view=rev
Log:
JS2-1034: use non-versioned encoding string so that passwords can be encoded/decoded between J2 versions; directly set credentail password and encode flag on import
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java?rev=787371&r1=787370&r2=787371&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java Mon Jun 22 19:58:57 2009
@@ -79,7 +79,7 @@
*/
public class JetspeedSecuritySerializer extends AbstractJetspeedComponentSerializer
{
- private static String ENCODING_STRING = "JETSPEED 2.2 - 2009";
+ private static String ENCODING_STRING = "JETSPEED-SERIALIZER-ENCODING";
private static String JETSPEED = "JETSPEED";
private static class ImportRefs
@@ -411,8 +411,7 @@
if (password != null && password.length() > 0)
{
PasswordCredential pwc = userManager.getPasswordCredential(user);
- pwc.setPassword(null, password);
- pwc.setEncoded((passwordEncoding == JetspeedSerializer.PASSTHRU_REQUIRED));
+ pwc.setPassword(password, (passwordEncoding == JetspeedSerializer.PASSTHRU_REQUIRED));
userManager.storePasswordCredential(pwc);
}
log.debug("add User done ");
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org