svn commit: r1547077 - in /webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security: WSDerivedKeyTokenPrincipal.java WSUsernameTokenPrincipal.java

[coheigea]

Author: coheigea
Date: Mon Dec  2 16:06:12 2013
New Revision: 1547077

URL: http://svn.apache.org/r1547077
Log:
Don't serialize passwords etc.


Conflicts:
        src/main/java/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java
        src/main/java/org/apache/ws/security/WSUsernameTokenPrincipal.java

Modified:
    
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java
    
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/WSUsernameTokenPrincipal.java

Modified: 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java?rev=1547077&r1=1547076&r2=1547077&view=diff
==============================================================================
--- 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java
 (original)
+++ 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java
 Mon Dec  2 16:06:12 2013
@@ -38,7 +38,7 @@ public class WSDerivedKeyTokenPrincipal 
     private int length;
     private int offset;
     private String basetokenId;
-    private byte[] secret;
+    private transient byte[] secret;
     
     public String getLabel() {
         return label;

Modified: 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/WSUsernameTokenPrincipal.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/WSUsernameTokenPrincipal.java?rev=1547077&r1=1547076&r2=1547077&view=diff
==============================================================================
--- 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/WSUsernameTokenPrincipal.java
 (original)
+++ 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/WSUsernameTokenPrincipal.java
 Mon Dec  2 16:06:12 2013
@@ -52,7 +52,7 @@ public class WSUsernameTokenPrincipal im
     private static final long serialVersionUID = 5608648208455259722L;
     private String name;
     private String nonce;
-    private String password;
+    private transient String password;
     private String createdTime;
     private String passwordType;
     private boolean digest = false;