Author: dkulp
Date: Tue Jan 18 01:35:39 2011
New Revision: 1060156
URL: http://svn.apache.org/viewvc?rev=1060156&view=rev
Log:
Merged revisions 1060153 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1060153 | dkulp | 2011-01-17 20:04:08 -0500 (Mon, 17 Jan 2011) | 2 lines
Remove println in test
Update to release version of wss4j
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/ws/security/pom.xml
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/security/pom.xml?rev=1060156&r1=1060155&r2=1060156&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/ws/security/pom.xml Tue Jan 18 01:35:39 2011
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.11-SNAPSHOT</version>
+ <version>1.5.11</version>
<exclusions>
<exclusion>
<groupId>axis</groupId>
Modified:
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java?rev=1060156&r1=1060155&r2=1060156&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
Tue Jan 18 01:35:39 2011
@@ -306,7 +306,7 @@ public class SecurityPolicyTest extends
s = s.substring(s.indexOf("Payload: ") + 9);
s = s.substring(0, s.lastIndexOf("Envelope>") + 9);
assertTrue("Content wasn't encrypted!", !s.contains("I don't like
that."));
- System.out.println(s);
+ //System.out.println(s);
Document d = XMLUtils.parse(new InputSource(new StringReader(s)));
Node nd = d.getDocumentElement().getFirstChild();
while (nd != null && !"Body".equals(nd.getLocalName())) {
