[wss4j] 01/02: Refreshed 01-no-saml.patch

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository wss4j.

commit b98897f4099571687a9ff3a564af85020317de53
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 7 06:51:59 2014 +0200

    Refreshed 01-no-saml.patch
---
 debian/patches/01-no-saml.patch | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/01-no-saml.patch b/debian/patches/01-no-saml.patch
index 1472366..3d820a2 100644
--- a/debian/patches/01-no-saml.patch
+++ b/debian/patches/01-no-saml.patch
@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -245,6 +245,11 @@
+@@ -250,6 +250,11 @@
                      <configuration>
                          <source>1.5</source>
                          <target>1.5</target>
@@ -235,10 +235,10 @@ Forwarded: not-needed
              if (returnedCredential.getTransformedToken() != null) {
                  result.put(
                      WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN, 
-@@ -100,7 +100,7 @@
-                 SAMLTokenPrincipal samlPrincipal = 
-                     new SAMLTokenPrincipal(credential.getTransformedToken());
-                 result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
+@@ -104,7 +104,7 @@
+                         new SAMLTokenPrincipal(credential.getTransformedToken());
+                     result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
+                 }
 -            } else if (credential.getPrincipal() != null) {
 +            } else */ if (credential.getPrincipal() != null) {
                  result.put(WSSecurityEngineResult.TAG_PRINCIPAL, credential.getPrincipal());
@@ -375,15 +375,15 @@ Forwarded: not-needed
              if (credential.getTransformedToken() != null) {
                  result.put(
                      WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN, credential.getTransformedToken()
-@@ -89,7 +89,7 @@
-                 SAMLTokenPrincipal samlPrincipal = 
-                     new SAMLTokenPrincipal(credential.getTransformedToken());
-                 result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
--            } else {
-+            } else */ {
+@@ -93,7 +93,7 @@
+                         new SAMLTokenPrincipal(credential.getTransformedToken());
+                     result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
+                 }
+-            } else if (credential.getPrincipal() != null) {
++            } else */ if (credential.getPrincipal() != null) {
+                 result.put(WSSecurityEngineResult.TAG_PRINCIPAL, credential.getPrincipal());
+             } else {
                  WSUsernameTokenPrincipal principal = 
-                     new WSUsernameTokenPrincipal(token.getName(), token.isHashed());
-                 principal.setNonce(token.getNonce());
 --- a/src/main/java/org/apache/ws/security/WSSConfig.java
 +++ b/src/main/java/org/apache/ws/security/WSSConfig.java
 @@ -75,6 +75,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wss4j.git